Commit Graph

22686 Commits

Author SHA1 Message Date
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
0ef31800b7 whoops 2016-07-09 22:50:05 -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
TullyBurnalot
b3dad9dae8 Fixes Unstable REMOTE_VIEW Bug
- Players with PSY_RESISTANCE are no longer viable targets for
REMOTE_VIEW
2016-07-10 02:44:00 +01: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
FreeStylaLT
2140d9168a removes dank trays from list 2016-07-10 03:40:05 +03:00
Kyep
35de9d2d69 Changed exile implants locker to armory access 2016-07-09 17:38:02 -07:00
Kyep
44fcc2dac7 Removed redundant condition 2016-07-09 17:35:01 -07:00
monster860
aa51c925ea The Long-Requested Nano-UI-ification of the ChemMaster 2016-07-09 20:34:57 -04:00
Ar3nn
a004075d47 things almost work now 2016-07-09 19:51:55 -04:00
Fox McCloud
bf07402fb9 Merge pull request #4948 from TullyBurnalot/DroneFix
Drone AntagHUD Fix
2016-07-09 18:55:39 -04:00
Fox McCloud
f20ac43730 Merge pull request #4909 from TullyBurnalot/PAEPERVERK
Admin Fax Template Flair
2016-07-09 18:54:32 -04:00
Fox McCloud
7ca21d2f91 Merge pull request #4953 from Krausus/JobBanRefactor
Job Ban Check Refactor
2016-07-09 18:36:41 -04:00
Fox McCloud
443e530f08 Merge pull request #4923 from TullyBurnalot/PhotocopyEmag
Photocopier Emagging and Toast
2016-07-09 18:32:55 -04:00
Fox McCloud
a8d010360c Merge pull request #4946 from TullyBurnalot/RevenantFix
Revenant Death Fix
2016-07-09 18:31:39 -04:00
Fox McCloud
276160ef8f Merge pull request #4928 from TullyBurnalot/Monocle!
Prescription Monocles
2016-07-09 18:31:16 -04:00
TheDZD
04d5219d6a Merge pull request #4929 from Fox-McCloud/hit-reactions
Hit reactions
2016-07-09 18:30:37 -04:00
Fox McCloud
c98ba8de79 Merge pull request #4925 from TheDZD/no-looking-back-no-regrets
The Honkening
2016-07-09 18:29:11 -04:00
Fox-McCloud
6a45502dd9 proper RD armor 2016-07-09 18:18:52 -04:00
TheDZD
306f1a8e2d Ghosts for the ghost throne 2016-07-09 17:58:39 -04:00
Mieszko Jędrzejczak
e1275c8a79 *sigh 2016-07-09 22:22:53 +02:00
Mieszko Jędrzejczak
037b149eda removes duplicate uniforms 2016-07-09 22:13:52 +02:00
Mieszko Jędrzejczak
30299a0b6b hon hon, mon ami! 2016-07-09 21:56:17 +02:00
Crazylemon64
ad1f67c9f9 Spaces to tabs 2016-07-09 11:57:56 -07:00
TullyBurnalot
36e9f46c0f Fixed typo in "proffesionalism"
IRONY
2016-07-09 17:25:58 +01:00
TullyBurnalot
78547e275a - Added two more fax templates
- Added "Keep up the good work" template
- Added "ERT Instructions" template
2016-07-09 16:38:14 +01:00
TheDZD
a144980bde Minor tweaks 2016-07-09 11:37:26 -04:00
TullyBurnalot
9b614a9df0 - Changed atom_say_verb
Photocopiers now "bleep" rather than "say"
2016-07-09 16:00:49 +01:00
Krausus
918ed392bd Job ban refactors/fixes 2016-07-09 06:05:07 -04:00
Mieszko Jędrzejczak
5745099842 birb. 2016-07-09 11:24:00 +02:00
Fox McCloud
cb26d1eb00 Merge pull request #4943 from Tastyfish/healthfix
Makes human's healthdoll immediately update upon health being changed
2016-07-09 04:38:54 -04:00
Twinmold
5888b6f003 Moves Check to human_attackhand.dm
Moves the check from sleeping_carp.dm to human_attackhand.dm, and puts
vampire bite as priority over martial arts when aimed at the head.
2016-07-09 03:04:07 -05:00
Kyep
36ab0b475c Improves ERTs
- Makes ERT summons prompt ghosts for whether they want to join, rather
than relying on an obscure verb under the ERT tab
- Avoids announcing the ERT until its actually spawned (or proven
unspawnable)
- Stops lobby players joining ERT
- Fixes typos with ERT prompts for admins
- Fixes weird double "Central Command" text in ERT announcements
2016-07-08 23:01:14 -07:00
Fox-McCloud
405df28fab Borg Power Use Refactor 2016-07-09 01:50:26 -04:00
TullyBurnalot
a0a95ca28a - Replaced "return 0" with "continue"
Should be fine now.
2016-07-09 05:03:55 +01:00
TullyBurnalot
14ec113bbd Fixes Drone AntagHUD issue
- Activating Antag HUD will now stop you from being a viable candidate
for repaired maintenance drones
2016-07-09 04:30:25 +01:00
TullyBurnalot
9775cf9ec4 Revenants can die now
- Removed "You can't die if you just died" insanity
2016-07-09 03:49:47 +01:00
Fox McCloud
d9c86e24ed Merge pull request #4922 from FalseIncarnate/kitchen
Buildable Deep Fryers
2016-07-08 21:19:02 -04:00
Fox-McCloud
9544d8409f Ports TG's Curesed Hearts 2016-07-08 20:51:08 -04:00
TullyBurnalot
52cc7786c0 - Replaced visible_message with atom_say
What the title says
2016-07-09 01:27:34 +01:00
Tastyfish
37d2721c76 Makes healthdoll immediately update upon being hit 2016-07-08 19:28:07 -04:00