Commit Graph
50029 Commits
Author SHA1 Message Date
Qwertytoforty a162cb4c90 Gives admins a way to smoothly end a round 2020-10-05 16:24:46 -04:00
AffectedArc07andGitHub 39a807c1d4 Fixes PDA Power Monitor Bug (#14539) 2020-10-05 14:05:00 -04:00
AffectedArc07andGitHub 0ad3254026 Merge pull request #14528 from TDSSS/cleaner-log-tweak
spraybottle logging change
2020-10-05 16:12:24 +01:00
AffectedArc07andGitHub b9ac5c0f57 Merge pull request #14529 from Kiyahitayika/Morgue-Destroy-Fix
Morgue Destroy() Fix
2020-10-05 16:00:39 +01:00
Kiyahitayika c8097f2192 Merge branch 'Morgue-Destroy-Fix' of https://github.com/Kiyahitayika/Paradise into Morgue-Destroy-Fix 2020-10-04 20:49:37 -04:00
Kiyahitayika f804e46adc Update morgue.dm 2020-10-04 20:49:21 -04:00
8282cfaef4 Update code/game/objects/structures/morgue.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-10-04 20:48:35 -04:00
0816b7037b Update code/game/objects/structures/morgue.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-10-04 20:48:28 -04:00
AffectedArc07andGitHub d82b8cf2b9 Merge pull request #13846 from dearmochi/refactor-spawning-from-vents
Refactor spawning on vents into one proc
2020-10-04 20:48:27 +01:00
AffectedArc07andGitHub 140c99411b Merge pull request #13621 from dearmochi/client-hud-consistency
Make HUD settings apply consistently
2020-10-04 20:45:57 +01:00
mochi 8a8a215393 Merge branch 'refactor-spawning-from-vents' of https://github.com/dearmochi/Paradise into refactor-spawning-from-vents 2020-10-04 21:05:07 +02:00
mochi 01fa079b72 Merge remote-tracking branch 'upstream/master' into refactor-spawning-from-vents 2020-10-04 21:03:25 +02:00
mochi 81f5fd176d Merge branch 'master' into client-hud-consistency 2020-10-04 20:59:52 +02:00
TDSSSandGitHub dbd162dff3 Adds Atmospheric Anomaly (#14433)
* New anomaly

* spacing

* agent b B-gone

* ansaris request
2020-10-04 13:44:29 -04:00
AffectedArc07andGitHub ae5a3470a5 Merge pull request #14009 from Kyep/remove_mining_access_card
Alters mining conscription kits to remove the mining access card
2020-10-04 18:39:36 +01:00
AffectedArc07andGitHub 48564e3b20 Merge pull request #13998 from Kyep/megafauna_jaunter
Wormhole Jaunters can no longer teleport megafauna to station, unless emagged
2020-10-04 18:38:47 +01:00
AffectedArc07andGitHub 561db683ad Merge pull request #13869 from Fox-McCloud/intercom-refactor
Refactors Intercomms For Less Processing
2020-10-04 18:37:24 +01:00
AffectedArc07andGitHub 3ca95d7e13 Merge pull request #14185 from Cocacolagua/go-rp-with-chef
Hot Chocolate and Chicken Soup nerf
2020-10-04 18:29:51 +01:00
AffectedArc07andGitHub 8537de8aa6 Merge pull request #14131 from farie82/ticket-conversion-fix
Refactors the ticket code. Fixes the ticket conversion. Removes bolding of names etc in tickets
2020-10-04 18:26:52 +01:00
AffectedArc07andGitHub f4636015bd Merge pull request #14455 from Kyep/terror_web_spacemove
Fixes zero-G spiderweb weirdness
2020-10-04 18:24:49 +01:00
AffectedArc07andGitHub 5a6828b6fd Merge pull request #14494 from kugamo/Snack-spritos
Inhand snack sprites
2020-10-04 18:23:17 +01:00
AffectedArc07andGitHub 397f98baee Merge pull request #14481 from Kyep/manifest_ssd
Improved OOC Manifest
2020-10-04 18:22:32 +01:00
AffectedArc07andGitHub 3ea5c69a50 Merge pull request #14409 from Kyep/hos_gun_info_update
Update hoslaser objective text
2020-10-04 18:21:47 +01:00
AffectedArc07andGitHub 54547a7ac5 Merge pull request #14440 from warior4356/cryoxadone-fix
Changes cryoxadone to check external temp instead of internal temp
2020-10-04 18:19:51 +01:00
AffectedArc07andGitHub dfad6545e9 Merge pull request #14526 from yorii/patch-2
Fix botany growthstage rounding error
2020-10-04 18:16:06 +01:00
AffectedArc07andGitHub 2b7c9c2b1f Merge pull request #14513 from SabreML/bnotice
Removes the 'bnotice' span class
2020-10-04 18:14:22 +01:00
AffectedArc07andGitHub b94e3b6905 Merge pull request #14522 from farie82/laser-tag-gun-field-gen-fix
Makes laser tags have 0 damage and makes the field generators take nodamage into consideration
2020-10-04 18:13:52 +01:00
Kugamo 581b5ba92b resized mr changs sprits 2020-10-04 10:19:52 -05:00
Fox McCloudandGitHub ec00ce9c6c Merge pull request #14092 from farie82/revert-14037-lag_wont_drag_on
Revert "Disables dragon transformation because its users can freeze the whole server"
2020-10-04 04:10:30 -04:00
Kiyahitayika c48c6b59ff Update morgue.dm 2020-10-03 19:29:33 -04:00
Kiyahitayika 729c3a1923 Morgue Destruction Fix 2020-10-03 19:15:25 -04:00
TDSSS d2c928cc7a spraybottle logging change 2020-10-04 00:03:03 +02:00
yoriiandGitHub 25150a2a7a fix botany growthstage rounding error 2020-10-03 22:39:33 +02:00
joep van der velden 7cd7d76eb6 Makes laser tags have 0 damage + check in field/generator/bullet_act 2020-10-03 15:26:20 +02:00
AffectedArc07andGitHub 6e10e0800e Merge pull request #14476 from nicetoolbox/pool-controller-tgui
[TGUI] Update pool controller to use TGUI
2020-10-03 09:16:19 +01:00
nicetoolbox 18253285ad build 2020-10-03 00:58:35 -07:00
def63e6619 Apply suggestions from code review
Co-authored-by: dearmochi <shenesis@gmail.com>
2020-10-03 00:56:47 -07:00
AffectedArc07andGitHub bb5a974a8b Merge pull request #14518 from farie82/diona-vampire-fix
Stops diona vampires from getting nutrient effects from light
2020-10-02 21:47:45 +01:00
joep van der velden 876c163897 Stops dionas from getting nutrients from light as vampire 2020-10-02 22:35:10 +02:00
AffectedArc07andGitHub eeb021e72e Merge pull request #14517 from farie82/camera-bug-fix
Makes camera bugs actually work
2020-10-02 21:09:58 +01:00
joep van der velden 83fb00a12b Flavor text 2020-10-02 21:45:27 +02:00
joep van der velden 51577e8695 Fixes camera bugs 2020-10-02 21:38:37 +02:00
AffectedArc07andGitHub 414cef224d Merge pull request #14515 from farie82/tgui_close_uis_fix
Makes gibtonite check if it has wires before closing TGUI windows
2020-10-02 20:31:55 +01:00
joep van der velden 7ac9bf46c2 Makes gibtonite check if it has wires before closing TGUI windows 2020-10-02 20:54:43 +02:00
SabreML 31dfa203f7 font-stye 2020-10-02 16:52:48 +01:00
SabreML 3f8ee9b375 Removes 'bnotice' span class 2020-10-02 16:17:26 +01:00
AffectedArc07andGitHub acc081e7df Merge pull request #14207 from dearmochi/fix-ghost-poll-chat-signup
Fixes unusable "sign up" chat button, some missing icons when polling for candidates and gimmick team
2020-10-02 10:50:47 +01:00
AffectedArc07andGitHub 7f2c93f7d7 Merge pull request #14467 from Aquilar/quickfixreflection
Fixes lasers ignoring shields of all types.
2020-10-02 10:49:34 +01:00
AffectedArc07andGitHub b6acce8f89 Merge pull request #14500 from farie82/martial-arts-fix2
Fixes some issue with being cloned while having martial arts
2020-10-02 10:47:56 +01:00
AffectedArc07andGitHub ed9c94210d Merge pull request #14503 from further-reading/master
[orion trail] Check if all crew dead before kill
2020-10-02 10:43:54 +01:00