Commit Graph

23759 Commits

Author SHA1 Message Date
YPO
ca688bc7cd Fixes players not being immune to their own slime timestops 2018-01-12 12:25:00 -07:00
Leo
91e87c869c Merge pull request #34301 from kevinz000/patch-428
Harvesters now normally attack those with NODISMEMBER species
2018-01-12 11:05:18 -02:00
Leo
2fc16d51ed Merge pull request #34305 from AutomaticFrenzy/patch/debug-mapping
Add JMP buttons to mapping debug verbs
2018-01-12 11:04:16 -02:00
JJRcop
1b1287e009 Removes some hrefs from logging (#34310)
* Removes key_name_admin calls from logging

* Removes JMP from gibtonite reaction logs
2018-01-12 11:03:28 -02:00
Leo
fae799a6d7 Merge pull request #34312 from AutomaticFrenzy/patch/canister-grammar
Fix description of relabelled canisters
2018-01-12 11:02:46 -02:00
ShizCalev
90ed87fda6 Fixes pet collars not updating icons (#34184) 2018-01-12 13:16:45 +01:00
ExcessiveUseOfCobblestone
60acd24b71 Pointing will now properly reflect a lack of arms (and legs!) (#34259)
* Update emote.dm

* Update emote.dm

* Update emote.dm

* toot
2018-01-11 22:37:41 -05:00
YPOQ
55ebe45700 Makes bot emagging more consistent (#34274) 2018-01-11 22:34:01 -05:00
AnturK
e24d6ac847 Fixes mobs on lavaland targeting through walls on wakeup (#34280) 2018-01-11 22:32:46 -05:00
PKPenguin321
92988c8304 Makes cyborg module damage visible to anyone nearby (#34287)
* swaps to_chats with visilbe_messages in damage feedback

* adds an actual alarm sound
2018-01-11 22:31:36 -05:00
Jordan Brown
a5f70b3708 Move a definition to the right file (#34288) 2018-01-11 22:30:24 -05:00
kevinz000
9fb4370fa8 Adds logging and feedback messages to organ manipulations by admins (#34298)
* logging

* Update manipulate_organs.dm
2018-01-11 22:22:51 -05:00
kevinz000
73389f2be5 Fixes forensics runtimes (#34336) 2018-01-11 22:11:46 -05:00
Leo
1a03b8ac21 Merge pull request #34270 from tgstation/Cyberboss-patch-3
Fixes toolarm grammar
2018-01-11 21:11:52 -02:00
kevinz000
19322f10b9 Fixes vehicle action handling ordering (#34146)
* Fixes cleanup not working for vehicle actions

* Wrong ordering

* Update vehicle_actions.dm
2018-01-12 09:11:07 +13:00
kevinz000
f27948eaa3 Fixes megafauna being able to port through jaunt tunnels due to snowflake code (#34164)
* Fixed megafauna porting through jaunt tunnels

* Update portals.dm
2018-01-12 09:09:57 +13:00
oranges
6790f8e193 Merge pull request #34117 from ShizCalev/medbot-tweak
Makes medbots unable to inject you if you are are fully covered with THICKMATERIAL.
2018-01-12 09:06:45 +13:00
Tad Hardesty
827c4b3f99 Replace hardcoded z-level numbers with a trait system (#34090)
* Add basic structure of z-level traits

* Restore space transitions and add z-level debug verb

* Restore proper ruin spawning and transit level creation

* Replace station_z_levels and related checks with traits

* Eliminate more uses of ZLEVEL_{STATION_PRIMARY,LAVALAND}
2018-01-12 09:05:49 +13:00
arsserpentarium
c86fc91b55 [READY]Pulling claw 2 (#33817)
Pulling claw is integrated circuit,which allows drones to pull things.
2018-01-12 09:02:56 +13:00
oranges
eb9180d7d6 Merge pull request #34204 from ShizCalev/chem-macro-feedback
improves chem macro feedback
2018-01-12 09:02:15 +13:00
Tad Hardesty
42886ff263 Fix description of relabelled canisters
And also fix name propriety of BZ canisters.
2018-01-11 05:21:19 -08:00
Jordan Brown
ccbdb551bd Stops the dbadmin warning if SQL_ENABLED isnt set (#34223) 2018-01-11 04:52:06 -05:00
AnturK
f44c8bf694 Fixes potato cells missing wires (#34253) 2018-01-11 04:50:08 -05:00
Tad Hardesty
683c902383 Replace CentComm with CentCom in deadchat message (#34249) 2018-01-11 04:36:33 -05:00
Tad Hardesty
b9a620472a Add JMP buttons to mapping debug verbs 2018-01-10 21:57:15 -08:00
kevinz000
22c89a2390 Update constructs.dm 2018-01-10 19:22:49 -08:00
ExcessiveUseOfCobblestone
2b0aeec82e Adds Display Name Argument to Techweb Logging (#34216)
* Update _techweb.dm

* Replaces ID with the name of the tech web

* REVERT ON THE WEBBITOR

* Webbitor Blues

* removes "
2018-01-10 15:57:33 -08:00
Leo
ca84aa200b Merge pull request #34168 from ShizCalev/dna-human-runtime
Corrects runtime when shooting humans
2018-01-10 20:04:22 -02:00
Leo
ce05906450 Merge pull request #34177 from ShizCalev/pet-rename
Prevents renaming uniquely named pets.
2018-01-10 20:03:43 -02:00
Leo
993e14e22e Merge pull request #34189 from ShizCalev/test-area-tick
CHECK_TICK & logging for cmd_admin_areatest
2018-01-10 20:03:01 -02:00
Leo
3d0813d01a Merge pull request #34203 from tortellinitony/asayf
Makes a hotkey for asay
2018-01-10 20:00:08 -02:00
Leo
7ccd0f2e9e Merge pull request #34219 from Cyberboss/RemoveSetBackground
Removes usage of set background
2018-01-10 19:53:23 -02:00
Leo
26d4e05d3d Merge pull request #34229 from Robustin/deconversionfix
Fixed cultists deconverting via holy water not giving a message
2018-01-10 19:46:01 -02:00
Leo
1aaf1e1c47 Merge pull request #34240 from Cyberboss/NewscasterFix
Fix newscaster href tokens
2018-01-10 19:44:21 -02:00
Jordan Brown
14a552cf51 Merge branch 'master' into RemoveSetBackground 2018-01-10 12:37:53 -08:00
Leo
3af46c802b Merge pull request #34232 from tgstation/Cyberboss-patch-9
Adds some drop_location()s
2018-01-10 18:25:41 -02:00
Leo
e9354ce5f6 Merge pull request #34228 from tgstation/Cyberboss-patch-8
Fixes runtimes when no ruin configs are set
2018-01-10 18:23:30 -02:00
Jordan Brown
6edc1c4ea5 Fixes toolarm grammar 2018-01-10 13:02:19 -05:00
ShizCalev
b78951009b Fixes buckled message spam for ghosts inside talking scythes (#34111)
* Fixes buckled message spam for ghosts

* params
2018-01-10 10:46:56 +01:00
Robustin
c906c17178 Fixes reflections (#34065)
File this under "how did nobody notice this shit for so long?" Currently reflections basically have the projectile pass through you like you're a piece of glass, which ruins one of its most important traitors (protecting people behind you/putting the shooter in danger.

Also energy shields are a meme and literally cannot block anything, instead of sparking a balance debate im just fixing the description so nobody gets duped.
2018-01-10 19:04:14 +13:00
oranges
41b06b0c31 Merge pull request #33933 from coiax/wizard-late-joining
Late joiners also get summoned guns/magic
2018-01-10 18:50:14 +13:00
oranges
fcc3dae19a Merge pull request #33436 from MrDoomBringer/DropItLikeItsHottest
For too many years, Cargonia has been oppressed, depressed, and re-pressed, by the slow and cumbersome movement of the supply shuttle. After hours of begging and pleading around on coderbus, I can present to you the ultimate cargo utility.

This update adds room for a certain level of progression with cargo, allowing for extra money to be spent on extra-fast delivery times. The drop pod itself picks a random, unblocked turf in the cargobay, then crashes down upon it, creating a small explosion and damaging some tiles.

The explosion exists to act as a secondary act of balance: the drop pod is intended to be used for a few VIP deliveries. Ordering in bulk will still require use of the shuttle, unless you are prepared to fix the shit out of an explosion-riddled cargo.

Because of the nature of the mechanic, it is very easy to spend a lot of money very quickly. For this reason, a separate console was created: so that it could be placed in the safety of the Quartermaster's office, away from the sausage fingers of incompetent greyshits and rookie cargotechs.
2018-01-10 12:06:39 +13:00
Leo
cdffdf143e Merge pull request #34169 from ShizCalev/heal-fix
Fixes fully_heal not curing disabilities
2018-01-09 21:02:14 -02:00
Leo
981f3ef075 Merge pull request #34187 from ShizCalev/butcher-droplocation
Switches butchering/gib drops to use drop_location
2018-01-09 20:57:57 -02:00
Leo
a47adc94ee Merge pull request #34195 from tgstation/Cyberboss-patch-1
Fixes weakref runtimes
2018-01-09 20:56:43 -02:00
Jordan Brown
5de03186df Fix newscaster href tokens 2018-01-09 16:40:56 -05:00
oranges
9009cf37cc Stop tesla spamming admin log (#34181)
The orbiting sub balls do not need an admin message and log entry
2018-01-09 15:22:46 -05:00
ShizCalev
998bb2ec27 improves chem macro feedback 2018-01-09 15:15:17 -05:00
Jordan Brown
c1df7abb2d Adds some drop_location()s 2018-01-09 13:51:06 -05:00
Robustin
30124c7be8 Deconversion fix 2018-01-09 13:15:40 -05:00