fc81daee07
Added Thermals and emp_act(). Tweaked some related code.
2015-03-08 20:19:02 +00:00
b1e340b19b
Added X-ray implant, implant icon, touched up surgery.
2015-03-08 17:25:05 +00:00
f0c3c9af07
Merge remote-tracking branch 'upstream/master' into cyberimplants
2015-03-06 18:52:25 +00:00
38bae63251
Added cybernetic implants and surgery.
2015-03-06 18:52:04 +00:00
d5ec11b91c
Merge pull request #8080 from Incoming5643/Appearance_fix
...
Tweaks and fixes for the appearance window
2015-03-06 12:20:24 -06:00
6b512f663a
Merge pull request #8137 from Incoming5643/so_misunderstood
...
Removes the Spooky
2015-03-06 00:09:25 -06:00
9cf4a0bfc6
Merge pull request #8114 from phil235/CookTrash
...
Cooking fixes for meat and trash
2015-03-05 23:54:29 -06:00
8fa6b3edea
Merge pull request #8140 from phil235/doughbeakerfix
...
Improvised heating fixes
2015-03-05 22:58:44 -06:00
07676b352d
Merge pull request #8128 from Ikarrus/gangfixup
...
Makes Gang mode functional again
2015-03-05 21:11:59 -06:00
50b8e2267e
Merge pull request #8146 from phil235/HydroTrayLightsSpritesFix
...
Fixes HydroTray Lights sprites.
2015-03-05 20:28:33 -06:00
546c5eedc4
if you have AI or cyborg set to high, you'll see that in the preview window instead of a nondescript naked human
2015-03-05 14:23:19 -05:00
a341fd72b0
Merge pull request #8065 from paprka/squiddeath
...
Rebalances thermals
2015-03-05 19:14:57 +01:00
372e082c66
Merge pull request #8013 from paprka/altclick
...
Alt-click for aesthetic toggling
2015-03-05 19:12:07 +01:00
93a5ba6e16
Merge pull request #8132 from MrStonedOne/wellthen
...
Fixes irc alerts of adminhelps not showing the ckey
2015-03-05 19:02:15 +01:00
2a3c211d81
Merge pull request #8131 from Jordie0608/sooneverythingwillbechangelogs
...
Re-adds changelog popup as a config option
2015-03-05 12:06:19 +03:00
f68fd02d26
Merge pull request #8101 from MrPerson/alert_alert_ur_a_faget
...
On screen alert system
2015-03-04 19:39:04 -06:00
e2554c55e6
Merge pull request #8147 from Cheridan/master
...
Manual Merge of #7607
2015-03-04 00:39:34 -06:00
56b0c321ac
Merge branch 'BlobReroll' of git://github.com/RemieRichards/-tg-station into RemieRichards-BlobReroll
...
Conflicts:
code/game/gamemodes/blob/overmind.dm
2015-03-04 00:33:44 -06:00
3fd821bdd7
Merge pull request #7986 from phil235/TaserJitterFix
...
Fixes taser stun duration
2015-03-04 00:01:49 -06:00
12d677a97b
Fixes HydroTray Lights sprites.
2015-03-04 02:08:34 +01:00
8192ea7e06
Removes the paths to get skeletons and zombies in normal play but also does not nerf them. They can still be found through a few very rare mutation chances (I think?) and wizbiz.
2015-03-03 16:55:02 -05:00
bb10824737
Improvised heating fix: Fixes dough recipe from egg + 15u flour beaker.
...
Adds a limit to how hot the beaker reagents can be heated. (no hotter than the heat source)
moving reagent_containers/attackby() to reagents/reagent_containers.dm for better visibility.
2015-03-03 22:35:11 +01:00
d36488e5a2
Merge branch 'master' of https://github.com/tgstation/-tg-station into NecromanticStone
...
Conflicts:
code/game/gamemodes/wizard/rightandwrong.dm
icons/obj/wizard.dmi
2015-03-03 20:58:38 +00:00
a028062624
Skeletons and zombies lose temperature immunity and radiation immunity, reducing how awesome they are in the face of their relative ease of access. They still don't breathe or have blood.
2015-03-03 14:46:32 -05:00
90e46f35bb
Fixes irc alerts of adminhelps not showing the ckey
...
Also fixes irc alerts of new players having the source split up in the announcement messages
2015-03-03 04:05:08 -08:00
c2290c6c5c
Merge pull request #7913 from phil235/NewPlants
...
Adds new plants to botany
2015-03-03 11:23:32 +01:00
e6e2ec2809
Readds changelog popup as a config option
2015-03-03 19:51:35 +11:00
665afe10e1
Merge pull request #8104 from Ikarrus/changelognotify
...
Chatlog notification of changelog updates
2015-03-03 10:36:57 +03:00
4d25d10d91
Increased chance of deconversion when applyinb brute force to head. The more hurt they are, the more likely they are to deconvert.
2015-03-03 00:30:29 -07:00
9b28452bfe
Makes Gang mode functional again
...
I'm going on vacation soon so I thought I might as well bring this game mode back up to at least a minimally functional state before I go.
A lot of features (Gang membership visibility, conversion pens, weapons, deconversion methods) have been stripped out for now. I gave gang bosses uplinks in the meantime.
It's basically rev vs rev right now, but the victory conditions with the recallers are still there. I'll work on adding more stuff after I return from my vacation.
2015-03-02 23:46:46 -07:00
a07f6e6bfa
Merge pull request #8103 from Ikarrus/antag_babbies
...
Age Restrictions for Antagonists
2015-03-03 09:02:52 +03:00
e85e010bd4
Cleanup: Removed an unnecessary comma
2015-03-02 22:37:27 -07:00
de362eabc9
Fixing type in index comments
2015-03-02 17:43:45 -07:00
467e102b49
Fixes trash disappearing when washed in a sink.
...
Fixes waffle trash being named "waffles".
Replacing some stat/weakened/stunned checks with incapacitated()
Fixes meat cutlets and steak not including meat type in their name (e.g. raw corgi meat cutlet)
Harvesting meat from simple animals now takes time, has a sound, and can be done with any sharp item.
2015-03-03 00:07:08 +01:00
24dcf08b2e
Merge branch 'master' of https://github.com/tgstation/-tg-station into alert_alert_ur_a_faget
...
Conflicts:
code/modules/mob/living/carbon/alien/humanoid/life.dm
code/modules/mob/living/carbon/alien/larva/life.dm
code/modules/mob/living/carbon/alien/life.dm
code/modules/mob/living/carbon/monkey/life.dm
icons/mob/screen_alien.dmi
2015-03-02 12:04:38 -08:00
539d51fb57
Merge pull request #8091 from MrStonedOne/whydidthistakesolong
...
Adds admin alert when random events fire
2015-03-02 12:02:43 -08:00
4272ada464
Merge pull request #8042 from Mandurrrh/ghostpda
...
Adds the ability to see pda messages in Deadchat
2015-03-02 19:56:28 +01:00
d2d0888432
Merge pull request #7726 from xxalpha/traymesons
...
Mesons+T-Ray = Engineering Goggles
2015-03-02 19:24:06 +01:00
c063665a84
Remove unnecessary check.
2015-03-02 18:15:51 +00:00
fd958372a3
Fixed a bug.
2015-03-02 17:41:59 +00:00
cde9de9e85
merge commits
2015-03-02 12:40:16 -05:00
42dd431e6f
Removed duplicate code.
...
Removed more duplicate code.
2015-03-02 17:24:40 +00:00
daffcdf075
Merge pull request #7987 from phil235/SugarSatietyRemoval
...
Remove sugar satiety effect
2015-03-02 18:17:40 +01:00
5341a48a86
span classes
2015-03-02 09:19:00 -07:00
da6d3fc2cd
Creates a separate toggle for ghosts to see pda messages!
2015-03-02 10:57:25 -05:00
a3076ce0eb
Admin event alerts can now be disabled per event.
...
Disabled for electrical overload and space dust.
2015-03-02 07:20:23 -08:00
d218256e32
Merge pull request #7854 from phil235/LifeProcsDuplicateFix
...
Life procs duplicate fix
2015-03-02 09:16:09 -06:00
2be30eb89e
Merge pull request #8083 from Delimusca/getochemboyz
...
added improvised heating
2015-03-02 08:58:12 -06:00
00be838acc
Merge pull request #8011 from Jordie0608/CMOSisforscrubskeepyourcomputerclocksavedinRAM
...
Server time for status panel
2015-03-02 08:32:48 -06:00
d856e240c2
Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants
...
Conflicts:
icons/mob/head.dmi
2015-03-02 13:45:15 +01:00
xxalpha