Commit Graph

13925 Commits

Author SHA1 Message Date
Chakirski
f8ce4ed19d Ahh yes, "Reapers" 2016-07-11 23:17:17 -05:00
Tastyfish
463fce5453 Fixes Check Piping verb 2016-07-12 00:10:31 -04:00
Fox McCloud
3934b9f841 Merge pull request #4841 from DaveTheHeadcrab/grey_speech_fix
Grey Update
2016-07-11 23:13:38 -04:00
SamCroswell
46954091e6 Minor Tweaks 2016-07-11 22:28:35 -04:00
Fox McCloud
b787af15f8 Merge pull request #4934 from Chakirski/BACON!
Adds AUTHENTIC, JUICY, AMAZING BACON!
2016-07-11 21:23:41 -04:00
Fox McCloud
c803c4f752 Merge pull request #4911 from Kyep/exile_option
Makes Exile & Lethal Injection Viable
2016-07-11 21:21:16 -04:00
TheDZD
5ba6e17739 Merge pull request #4917 from TullyBurnalot/BureaucracyUpdate
Bureaucracy Update
2016-07-11 21:20:06 -04:00
Chakirski
a031ebe889 Update snacks.dm 2016-07-11 20:17:30 -05:00
TheDZD
2b5e36b296 Merge pull request #4935 from Twinmold93/martialartsvampire
The Sleeping Carp Vampires
2016-07-11 21:10:57 -04:00
Fox McCloud
665fb967b2 Merge pull request #4961 from monster860/chemmaster-nanoui
The Long-Requested Nano-UI-ification of the ChemMaster
2016-07-11 21:02:25 -04:00
TheDZD
813f6f3778 Merge pull request #4962 from Fox-McCloud/ipc-change
Removes IPC Firesuit Cheese
2016-07-11 21:01:31 -04:00
TheDZD
960676d53b Merge pull request #4964 from Kyep/cryo_ghost
Improves Cryoing
2016-07-11 21:01:04 -04:00
TheDZD
66c8eb899e Merge pull request #4966 from Fox-McCloud/ntrep-cane
Nanotrasen Rep Cane Tweak
2016-07-11 20:59:34 -04:00
TheDZD
ca7530f58d Merge pull request #4968 from Fox-McCloud/blood-refactor
Blood Refactor+Fixes
2016-07-11 20:57:25 -04:00
TheDZD
6b047f1ac1 Merge pull request #4975 from Fox-McCloud/cinematic-fix
Cinematic Fix and Relative Pathing
2016-07-11 20:53:59 -04:00
TheDZD
2f9dab5f1e Merge pull request #4978 from Krausus/UhOhImSlowingDownAlternateAppearanceCodeAgain
Actually Fixes Those Stupid Plants (By Fixing Alternate Appearances)
2016-07-11 20:52:40 -04:00
Fox McCloud
374b682bf7 Merge pull request #4990 from FlattestGuitar/pulse-stuf
Fixes pulse shot cost.
2016-07-11 20:46:22 -04:00
Fox McCloud
595297fb6e Merge pull request #4991 from Krausus/ThereCanOnlyBeOneHookSystem
Fixes Morgue Updating and Eliminates VG-style Hooks
2016-07-11 20:41:32 -04:00
TheDZD
48ef42e6cc Merge pull request #5001 from LittleBigKid2000/master
Fixes the brownstar reagent's description
2016-07-11 20:08:02 -04:00
Isaac Erwin
2509969a65 Fixes the brownstar reagent's description 2016-07-11 19:48:16 -04:00
Tigercat2000
863595a512 krausy wai 2016-07-11 15:50:15 -07:00
Tigercat2000
15de192719 Metastation Fixes v5555555
- Fixes a few missing pipes
 - Fixes the grav gen being horrifyingly mangled
 - Fixes runtimes on start because of decorative shuttle consoles
2016-07-11 15:41:33 -07:00
Krausus
355fb3c080 Fixes morgue updating and removes VGhooks 2016-07-11 17:39:21 -04:00
Mieszko Jędrzejczak
4751e0988c Fixes pulse shot cost. 2016-07-11 19:52:24 +02:00
SamCroswell
d79302ede6 Merge Conflict Resolution 2016-07-11 13:04:30 -04:00
Fox-McCloud
b7c71c7c76 differences 2016-07-11 09:23:43 -04:00
Fox-McCloud
2a3ccf3729 Cyborg Upgrade Additions and Refactor 2016-07-11 06:16:44 -04:00
Kyep
e14f1b7529 Adds Cluwne EVILFAX
Fox Changes

Fox Spacing
2016-07-11 00:39:11 -07:00
SamCroswell
f5f6817a44 Inane Optimizations And General Pedantry 2016-07-11 02:42:28 -04:00
SamCroswell
e84ebcbca7 Jay Wingler Fluff Item 2016-07-11 01:53:52 -04:00
Chakirski
7635de3020 Sliceable cutlets are sliceable not sliceable 2016-07-10 18:22:32 -05:00
Fox McCloud
4fa956054c Merge pull request #4959 from TheDZD/salt-for-the-salt-god
Adds "salts" to the Say Verbs for Deadchat
2016-07-10 19:10:54 -04:00
Krausus
308c8a5667 Fixes alternate appearances right
Still uses inefficient for loops in Login and Destroy, though~
2016-07-10 17:56:53 -04:00
Fox McCloud
a8da06536c Merge pull request #4977 from FlattestGuitar/grenade-launchers
Fixes the m90 grenade launcher.
2016-07-10 15:51:08 -04:00
Mieszko Jędrzejczak
593aaee243 :^] 2016-07-10 21:43:56 +02:00
Fox-McCloud
a23ca1ae88 Cinematic Fix and Relative Pathing 2016-07-10 15:20:13 -04:00
TheDZD
a97f0eaeea Merge pull request #4952 from Fox-McCloud/borg-power
Borg Power Use Refactor
2016-07-10 14:23:37 -04:00
monster860
009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
monster860
10292105ad Makes a bunch of UI's use /datum/browser 2016-07-10 09:19:14 -04:00
Mieszko Jędrzejczak
8f5ddf2be1 Fixes conflicts, conflicts. 2016-07-10 13:03:01 +02:00
Kyep
7c47dfcc56 Spacing 2016-07-10 02:47:43 -07:00
FalseIncarnate
072b2bc6c6 Recycling adjustments
Max containers and the ratios for converting sheets to bottles/cans now
are defines, rather than magic numbers
2016-07-10 03:43:35 -04:00
Fox-McCloud
7165360832 Blood Refactor+Fixes 2016-07-10 02:58:00 -04:00
Fox-McCloud
9a8b9a29ee Nanotrasen Rep Cane Tweak 2016-07-09 22:41:46 -04:00
Kyep
43afd64396 Improves Cryoing
- Changes cryoing, such that if you use OOC->Ghost while in a cryopod,
you are instantly moved to long-term storage. After all, you can't get
back into your body at that point anyway, so keeping your body around
for 30 minutes before announcing that you've disappeared is pointless.
- Changes the notification given to antags whose target cryos, to make
it slightly more obvious.
- Makes long-term storage announcements include stored person's rank (if they have one).

Added rank to cryo storage announcement

Removes list() call from pick()
2016-07-09 19:22:34 -07:00
Fox-McCloud
e0b50cd87a tweak 2016-07-09 22:21:28 -04:00
Twinmold
e437e256f1 No Unneeded 0's in Return
Title... Really...
2016-07-09 21:19:36 -05:00
TheDZD
0617cad287 Merge pull request #4944 from Fox-McCloud/cursed-heart
Ports TG's Cursed Hearts
2016-07-09 21:02:31 -04:00
Fox McCloud
88a0482d27 Merge pull request #4688 from FreeStylaLT/maintgoodies
Adds a bunch of items to maint, Syndicate contraband included, tweaks probabilities.
2016-07-09 20:51:40 -04:00
Fox-McCloud
6bd7d73f7b Removes IPC Firesuit Cheese 2016-07-09 20:43:49 -04:00