Swag McYolosteinen
daffcdf075
Merge pull request #7987 from phil235/SugarSatietyRemoval
...
Remove sugar satiety effect
2015-03-02 18:17:40 +01:00
Cheridan
d218256e32
Merge pull request #7854 from phil235/LifeProcsDuplicateFix
...
Life procs duplicate fix
2015-03-02 09:16:09 -06:00
Cheridan
2be30eb89e
Merge pull request #8083 from Delimusca/getochemboyz
...
added improvised heating
2015-03-02 08:58:12 -06:00
Cheridan
00be838acc
Merge pull request #8011 from Jordie0608/CMOSisforscrubskeepyourcomputerclocksavedinRAM
...
Server time for status panel
2015-03-02 08:32:48 -06:00
Swag McYolosteinen
7c0e24f692
Merge pull request #7454 from Iamgoofball/patch-24
...
Makes water wash colorful reagent off too
2015-03-02 13:28:26 +01:00
Cheridan
6ca5a89025
Merge pull request #8036 from paprka/fixfueltank
...
Fixes practice lasers exploding fuel tanks
2015-03-02 05:54:09 -06:00
Cheridan
8d9d45131b
Merge pull request #8004 from GunHog/RemovesXenoFunFromExperimentor
...
Replaces Xenomicrobes with Sulfuric Acid
2015-03-02 01:12:56 -06:00
Cheridan
6e68c4cb67
Merge pull request #8030 from Iamgoofball/patch-37
...
Nerfs Beepsky Smash (rip in peace)
2015-03-02 01:00:28 -06:00
Cheridan
e812f8a47b
Merge pull request #7844 from RemieRichards/DroneUpdate20-02-2015
...
Drone Skins + Drone Organic Vision Modes
2015-03-02 00:56:12 -06:00
Cheridan
90aabb4a67
Merge pull request #8077 from Iamgoofball/patch-39
...
Buffs Oxygen Blob and Radblob
2015-03-02 00:45:23 -06:00
Remie Richards
14d5b559c7
Merge pull request #8072 from MrStonedOne/isee-saidtheblindman
...
Fixes #772 Toggling darkness off prevents ghosts from seeing one another
2015-03-01 22:01:35 +00:00
MrStonedOne
64851a016f
Adds blob overmind cursor mob to ghost darkness vision
...
Thanks @Ricotez
Also tweaks the wording of related verbs, procs, and variables to match
Moves the scope of the ghostimages (now ghost darkness images) var and updatedateallghostimages proc to the global space so other things can access them
2015-03-01 04:07:10 -08:00
Razharas
e505acf591
Merge pull request #7985 from Jordie0608/tgstationisaparadiseforlumberjacks
...
Cleanup of changelog related files
2015-03-01 13:20:33 +03:00
Delimusca
747ebbc78d
added improvised heating
2015-02-28 20:51:39 -07:00
Razharas
111cb2a009
Merge pull request #8018 from phil235/BugFixA
...
A bundle of fixes
2015-03-01 06:44:02 +03:00
Remie Richards
90a2385c41
Merge pull request #8049 from TheVekter/shotglassfixv3
...
Re-adds the shot glass sprites
2015-03-01 01:47:12 +00:00
Iamgoofball
86fa3c113c
Buffs Oxygen Blob
2015-02-28 15:49:23 -08:00
MrStonedOne
a26839cde0
Adds a new ghost verb to toggle ghost visibility
...
For users who depended on the old buggy version of see darkness.
reworks seedarkness logic to mash well with the new verb, looks nicer too
2015-02-28 13:43:55 -08:00
Remie Richards
88cc21cb6d
Merge pull request #7963 from Incoming5643/manage_ass
...
Updates Manage Job Slots to work with assistant slots
2015-02-28 21:28:44 +00:00
Remie Richards
679c63a8ea
Merge pull request #7924 from Incoming5643/mulligan_rounds
...
Mulligan Rounds for Wizard/Blob/Malf
2015-02-28 21:27:18 +00:00
MrStonedOne
ef95d03a13
fixes runtime when client disconnects while a ghost.
2015-02-28 13:16:04 -08:00
MrStonedOne
ff1a0d3ecd
Moves global var ghostimage over to a static var on ghosts
2015-02-28 10:35:20 -08:00
MrStonedOne
0257dbfc9a
Fixes #772 Toggling darkness off prevents ghosts from seeing one another.
...
Abuses client.images to get around the issue with flat see_invisible scaling not allowing for both being able to see ghosts while not seeing darkness layers.
2015-02-28 10:12:16 -08:00
Remie Richards
c4b78e37af
Merge branch 'master' of https://github.com/tgstation/-tg-station into DroneUpdate20-02-2015
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/simple_animal/friendly/drone.dm
icons/mob/head.dmi
2015-02-28 16:19:13 +00:00
Remie Richards
8cee97f54f
Merge pull request #7942 from dannno/nothingmatters
...
THE OWL RETURNS
2015-02-28 16:06:35 +00:00
danno "big fucking moron" gonzales
49fc3d290c
move alt_desc to obj/item/clothing
2015-02-28 11:02:58 -05:00
Razharas
926c2f7413
Merge pull request #8027 from Iamgoofball/patch-36
...
I apparently added morphine to Deus. This was not intended.
2015-02-28 07:00:27 +03:00
Razharas
1b866bad83
Merge pull request #8024 from Iamgoofball/patch-35
...
Fixes the meth recipe
2015-02-28 06:59:56 +03:00
TheVekter
f6e18e9e45
Re-adds the shot glass sprites.
2015-02-27 17:14:50 -06:00
dannno
027eccedbc
conflicts fixed
2015-02-27 14:01:42 -05:00
phil235
fa0e5344ef
Removes sugar effects.
2015-02-27 19:01:32 +01:00
Razharas
b233b54cab
Merge pull request #8006 from MrStonedOne/SomeThingThatEndsInYFollowedByTwoNumbers
...
Panic bunker + new player notification configs
2015-02-27 16:17:20 +03:00
Razharas
e0aa321ca0
Merge pull request #8037 from paprka/blackchowder
...
Fixes dark matter server crashing, retools dark matter to be less bad
2015-02-27 15:30:17 +03:00
paprka
8807c433ae
modifies dark matter
2015-02-27 04:21:56 -08:00
paprka
5938cc7325
fixes practice lasers exploding fuel tanks
2015-02-27 03:58:25 -08:00
Razharas
12e4047cbe
Merge pull request #7988 from Menshin/protalathe_matcheck_fix
...
Fixes protolathe incorrectly checking material amount
2015-02-27 11:11:52 +03:00
Razharas
78e504f33e
Merge pull request #7994 from Incoming5643/colormesurprised
...
Fixes podmen always being sickenly off white upon creation
2015-02-27 11:10:55 +03:00
Razharas
a8cedc14ef
Merge pull request #7969 from optimumtact/nanouibeginnings
...
Auto load required nanoui files on client login
2015-02-27 10:36:13 +03:00
Iamgoofball
081b957a48
Nerfs Beepsky Smash
2015-02-26 20:52:31 -08:00
Iamgoofball
16f319bffd
I apparently added morphine to Deus. This was not intended.
2015-02-26 20:27:14 -08:00
Iamgoofball
7a990a0a28
Fixes the meth recipe
...
phosphorus
2015-02-26 18:22:22 -08:00
MrStonedOne
cf5d5794c7
Adds failed login message for panic bunker.
2015-02-26 16:54:20 -08:00
MrStonedOne
5529222b62
Fixes guests being allowed to connect while panic bunker is active
...
I was tempted to move all the panic bunker shit to isbanned(), but doing so would mean adding yet ANOTHER query that gets run on every connection, and run for every player on world restart.
That just seemed like not worth the effort to just make panic bunker trigger a little bit earier.
2015-02-26 16:48:43 -08:00
MrStonedOne
af4c2d86d6
Tweaks panic bunker verb logic a little bit
...
Allows toggling even if the database is not connected, alerts admins instead.
2015-02-26 16:02:26 -08:00
MrStonedOne
b39f120f4b
Makes the irc new player alert option behave like irc admin pm notices
...
It will only trigger if the new player alert is enabled for admin display and no valid non-afk admins are on to see it.
2015-02-26 14:07:56 -08:00
dannno
9b1fa2479b
conflict fixing + changelog
2015-02-26 16:48:11 -05:00
dannno
626bb9ffcc
THE OWL RETURNS: PART 3: ESCALATION
...
- adds The Owl hardsuit (admin spawn only, reskinned nukeop suit)
- changes nuke op hardsuit toggle proc to be more general, for more unique hardsuits
- removes armor from owl/griffin wing costumes (it didn't make sense anyways)
2015-02-26 13:59:09 -05:00
phil235
7171cd252b
Fixes no blood dna on Mulebot and its blood tracks.
...
Fixes putting buckled mobs onto morgue trays.
Fixes mob pixel offset when unbuckled from roller bed.
Fixes blood trail appearing when pulling a patient on a roller bed.
Fixes other minor stuff.
2015-02-26 19:31:55 +01:00
Swag McYolosteinen
c6866b0369
Merge pull request #7881 from paprka/sayycode
...
Bolded yelling and missing green span
2015-02-26 17:59:17 +01:00
phil235
a3aa6ff4bf
Reworked slime/death() and slime/gib().
2015-02-26 16:03:47 +01:00
