Swag McYolosteinen
c2290c6c5c
Merge pull request #7913 from phil235/NewPlants
...
Adds new plants to botany
2015-03-03 11:23:32 +01:00
Razharas
665afe10e1
Merge pull request #8104 from Ikarrus/changelognotify
...
Chatlog notification of changelog updates
2015-03-03 10:36:57 +03:00
Razharas
a07f6e6bfa
Merge pull request #8103 from Ikarrus/antag_babbies
...
Age Restrictions for Antagonists
2015-03-03 09:02:52 +03:00
Ikarrus
e85e010bd4
Cleanup: Removed an unnecessary comma
2015-03-02 22:37:27 -07:00
Ikarrus
de362eabc9
Fixing type in index comments
2015-03-02 17:43:45 -07:00
hornygranny
539d51fb57
Merge pull request #8091 from MrStonedOne/whydidthistakesolong
...
Adds admin alert when random events fire
2015-03-02 12:02:43 -08:00
Swag McYolosteinen
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
phil235
d2d0888432
Merge pull request #7726 from xxalpha/traymesons
...
Mesons+T-Ray = Engineering Goggles
2015-03-02 19:24:06 +01:00
xxalpha
c063665a84
Remove unnecessary check.
2015-03-02 18:15:51 +00:00
xxalpha
fd958372a3
Fixed a bug.
2015-03-02 17:41:59 +00:00
Mandurrrh
cde9de9e85
merge commits
2015-03-02 12:40:16 -05:00
xxalpha
42dd431e6f
Removed duplicate code.
...
Removed more duplicate code.
2015-03-02 17:24:40 +00:00
Swag McYolosteinen
daffcdf075
Merge pull request #7987 from phil235/SugarSatietyRemoval
...
Remove sugar satiety effect
2015-03-02 18:17:40 +01:00
Ikarrus
5341a48a86
span classes
2015-03-02 09:19:00 -07:00
Mandurrrh
da6d3fc2cd
Creates a separate toggle for ghosts to see pda messages!
2015-03-02 10:57:25 -05:00
MrStonedOne
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
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
phil235
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
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
Ikarrus
e974d10058
Chatlog notification of changelog updates
2015-03-01 20:56:38 -07:00
Ikarrus
f95ca85ed6
Age Restrictions for Antagonists
...
Default minimum age is 7 days.
Team Antag modes and wizard is 14 days.
Malf minimum is 30 days (Same as AI minimum age).
2015-03-01 20:40:04 -07: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
xxalpha
f9ebb2cff7
Merge remote-tracking branch 'upstream/master' into traymesons
...
Conflicts:
code/modules/research/designs.dm
icons/mob/eyes.dmi
icons/obj/clothing/glasses.dmi
2015-02-27 21:15:01 +00: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
