ShizCalev
59fa1ce21a
Hits another ban time duration with DisplayTimeText()
2018-10-23 23:53:39 -04:00
Jordan Brown
270ef4ce1d
Merge pull request #41072 from ShizCalev/examine-robo-prosthesis
...
Fixes incorrect examine message for damaged robotic limbs
2018-10-23 11:39:01 -04:00
XDTM
89fe484b6d
Phobia trigger words are highlighted in pulsing red/black ( #40885 )
...
* Phobia trigger words are highlighted in pulsing red/black
* .
* !
* >:(
* fixes
* fixes 2
2018-10-23 14:49:05 +02:00
MrDoomBringer
62529acdde
Cleans up and adds more concise admin logging to the centcom podlauncher ( #40696 )
...
* shoutout to spacemaniac and qusdtyu
* slight yeets
* slight grammer fixes
* yes
* asdf
* yikes
* fixes
* ok this should be better
* key_name
* begone, proc overhead
2018-10-23 14:45:19 +02:00
QualityVan
18f59b804d
Fixes robotic cell death ( #40815 )
...
* wounds never ever
* diseases exist at living oops
* Replace only_robotic and only_organic args with required_status
2018-10-23 14:44:30 +02:00
Fel
82e7d940d4
[Ready] Slime Crossbreeding - Chilling Extracts ( #40928 )
...
* Hello again, friend of a friend
* Grammar and consistency are for people who got enough sleep last night.
* ShizCalev, we meet again. For the last time.
* Old code. Tastes like trait recognition.
* Fel is so good at coding she doesn't even need to compile, she thought.
* Who needed the ability to agree, anyway?
* `return` of the jedi
* Revert "`return` of the jedi"
This reverts commit 97f192725af1c5b267cd0ba42d48fac5bbd86afa.
* github doesnt like special character commits
* Really tacky glasses are now tackier
2018-10-23 12:35:27 +03:00
Jordan Brown
6dc4ecf884
Merge pull request #41051 from Steelpoint/MagRename
...
Alters Sketchin Uplink Description
2018-10-22 14:55:54 -04:00
Jordan Brown
901902527d
Merge pull request #41033 from fluffe9911/patch-1
...
Makes Romerol Buyable for Nuke Ops
2018-10-22 14:55:32 -04:00
Jordan Brown
c80e619de3
Merge pull request #41056 from SamHPurp/sdql-typo
...
Minor typo fix in SDQL
2018-10-22 14:53:32 -04:00
Cauã dos Santos Rebelo
f9948e9c2b
Fixed penguin butchering and made babies only drop one meat ( #41047 )
2018-10-22 12:43:18 -04:00
granpawalton
b30c9213f7
adds in Grey Bull a new soda ( #40982 )
...
* adds grey bull as a soda in the drink machine
* grammer
* changes desc to and can amount to 20u
* Update code/modules/reagents/chemistry/reagents/drink_reagents.dm
Co-Authored-By: granpawalton <trentc7@yahoo.com >
2018-10-22 16:16:47 +03:00
ShizCalev
d82802e286
Fixes incorrect examine message for damaged robotic limbs
2018-10-22 03:40:45 -04:00
Jordan Brown
b7f32a8d28
Merge pull request #41046 from optimumtact/qintsec
...
Fix the mix sound on quintuple sec
2018-10-21 21:07:25 -04:00
Jordan Brown
206e13fd80
Merge pull request #41034 from ShizCalev/brain-notice
...
Adds a notice when you damage a brain via ghetto surgery
2018-10-21 16:19:26 -04:00
Mickyan
d1b10b2691
Vendor tweaks & prices: take 2 ( #40927 )
...
* vendor tweaks
* i was never good at cooking
* soda
* boozeomat sorting
* updated ramen desc
2018-10-22 08:40:24 +13:00
Kierany9
51549a41b7
Finding an objective target by role now actually picks a random target ( #41036 )
...
* finally
* length check
2018-10-21 21:39:17 +03:00
Purpose
648e5382af
minor typo fix
2018-10-21 18:28:14 +01:00
Steelpoint
47b8e1fb9a
RenameDesc
2018-10-21 20:38:32 +08:00
Jordan Brown
3d7fe20f72
Merge pull request #40997 from ShizCalev/suicide-roles
...
Adds a config option to automatically reopen job positions of folks who suicide at roundstart
2018-10-21 03:02:15 -04:00
MrDoomBringer
703a365aec
Various code improvements ( #40932 )
...
* adsf
* asdf
* take these
* Further cleanup to windoor code
2018-10-21 03:01:02 -04:00
Jordan Brown
0deea0089d
Merge pull request #41018 from kevinz000/patch-578
...
Reverts accidental disarm stun removal
2018-10-21 02:50:25 -04:00
oranges
8f5ca938f9
Fix the mix sound on quintuple sec
2018-10-21 04:56:56 +00:00
ShizCalev
1f5e451a7e
Jobbans now use DisplayTimeText ( #41025 )
...
Forgot these were separate.
2018-10-20 11:36:27 -07:00
ShizCalev
41a2935b67
Clean up redundant text2num in ban messages ( #41024 )
2018-10-20 11:35:57 -07:00
ShizCalev
c4064c9dac
Fixes syndicate MMI nameswaping, adds better user feedback when inserting a dead brain ( #41023 )
2018-10-20 11:35:32 -07:00
QualityVan
66000159d8
Fix fresh zombies not getting claws ( #41020 )
...
Caused by movement overhaul being indiscriminate in replacements.
2018-10-20 11:33:10 -07:00
ShizCalev
bfcfcc6ad1
Adds a notice when you damage a brain via ghetto surgery
2018-10-20 14:15:37 -04:00
fluffe9911
9ca2c50d2f
Makes Romerol Buyable for Nuke Ops
2018-10-20 10:11:23 -04:00
kevinz000
3c7c6a61ea
Remove a pointless null operation ( #41019 )
...
YOU SHALL NOT PASS() 2.0
Sometimes I look at code I've written in the past and wonder how sleep
deprived/drunk one has to be to write that.
2018-10-19 22:50:05 -07:00
MrDoomBringer
e4db7a8477
Fix explosions damaging rod form wizards and supply pod contents ( #40758 )
...
The issue was that when casting rod form, the wizard is forceMoved() into the
rod. When an epicenter explosion happens, explosion.dm forcibly goes through
the contents of EVERYTHING, and calls ex_act().
This caused the wizard in the contents of the rod to get damaged by epicenter
explosions (ie if they hit a fuel tank in rod form)
2018-10-19 22:20:59 -07:00
Supermichael777
26843eaf7e
Necromantic stones are now a bit more aggressive when snatching souls ( #40917 )
...
* The revenge of ghost snachin willy
* I'm not sure that other way works so I'll do one I'm sure of put one i know will
* Should probably put it before the check
* Uses the spookier list
2018-10-19 22:19:52 -07:00
nichlas0010
cd0c7774d7
Turn the AI icon selection menu into a radial ( #40962 )
...
Also removes "green" from the global list, since there's no AI display called
green, and renames "wierd" to "weird", so it works properly
2018-10-19 22:19:27 -07:00
ShizCalev
f13793012a
Revert "Clowns and Mimes acts no longer get ruined when you examine their ID cards ( #40655 )" ( #40985 )
...
This reverts commit 81d452d / #40655
This was fixed properly by #40951 .
This also introduced a bug where ERT personnel (and anyone who spawns in with a
non-standard ID card in their outfit datum) get bank accounts assigned to
"Emergency Response Team Commander", "Security Response Officer", etc.
2018-10-19 22:18:25 -07:00
ShizCalev
ca57ca7bee
Fix being unable to stuff money into IDs ( #41006 )
2018-10-19 22:17:28 -07:00
ShizCalev
964f3865f9
Traits -> Quirks correction ( #41010 )
2018-10-19 22:16:34 -07:00
Emmett Gaines
f66e311ebc
Makes species speedmod a true movespeed modifier ( #40992 )
2018-10-19 15:26:19 -04:00
kevinz000
337742902e
Update species.dm
2018-10-18 22:56:20 -07:00
Jordie
c56f2a81ff
fix ban time check runtime
2018-10-19 10:54:35 +11:00
tralezab
2a97dd6549
phyrexian scriptures ( #40993 )
2018-10-18 19:39:49 -04:00
MMMiracles
c89b619bd9
Penguins now waddle + waddle organ ( #40989 )
...
* and he waddled away, waddle waddle
* waddle ears + initialize
* ninjanomnom fixes + meat
* taste stuff change
webbit
2018-10-18 16:29:59 -04:00
ShizCalev
d470262007
Ban Message Duration ( #40986 )
2018-10-18 14:02:12 -04:00
ShizCalev
22090ed8ee
Corrects abductor baton path ( #40974 )
2018-10-17 22:35:56 -04:00
ShizCalev
b3e4cc3dc2
Automatically reopens position slots of mobs who suicide at roundstart
2018-10-17 19:57:15 -04:00
Jordan Brown
bb6da6f001
Merge pull request #40953 from ShizCalev/mannitol-ghetto-surgery
...
Ghetto surgery can now damage brains. Mannitol can heal damaged brains.
2018-10-17 16:21:43 -04:00
AnturK
ba0ea6f366
Fixes anti stun implant nonsense ( #40963 )
2018-10-17 14:20:07 -04:00
AnturK
149bb02107
Fixes rpgloot armor runtime. ( #40965 )
2018-10-17 14:19:34 -04:00
ShizCalev
52748e91a9
Monkeys no longer move at lightspeed ( #40968 )
2018-10-17 14:18:01 -04:00
AnturK
a365d6bc6b
Fixes pai instrument nonsense. ( #40958 )
...
* Fixes pai instrument nonsense.
* "
* Also moves this somewhere more relevant
2018-10-17 13:07:48 -04:00
Fel
a7b90799fc
Glorious Tauntaun Invocation ( #40955 )
...
* Glorious Tauntaun Invocation
* And I thought it smelled bad on the outside.
2018-10-17 11:26:58 -04:00
oranges
294cd92353
Merge pull request #40951 from ShizCalev/ID-fix
...
Fixes fully_replace_character_name not updating bank account names
2018-10-18 00:03:16 +13:00