fac10fb031
TG update: Removed all global modifications of toxloss. Added a setToxLoss() proc.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2653 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-24 22:07:37 +02:00
ea79e4b272
TG update: Removed some redundant checks
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2652 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-24 22:06:57 +02:00
7707864437
TG update: Jetpack changing to wrong sprite when turned on fixed. Syringes will autochange inject/draw when full/empty. Medborg syringes start full and set to inject even though the icon is still messed up.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2650 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-24 22:05:16 +02:00
d565fe7a9c
TG update: Tracked down the last bottles with limited transfer amounts and made more transfer amounts for them.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2647 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-24 22:00:26 +02:00
a631f38041
TG update: Drills and Ddrills now dig sand faster than shovels. Changed digging to produce 5 glass ore instead of 4.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2646 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-24 21:59:03 +02:00
6fd39d5ef6
TG update: food.dmi
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2644 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-24 21:37:53 +02:00
a0a49b6ee1
forgot to add category to edit appearence verb
2011-12-24 09:16:02 -05:00
3f1d378f13
edit appearance admin verb ported from old code
2011-12-24 02:38:21 -05:00
b067fdc726
TG update: ...
...
- added feedback logging for alert levels
- alert level descriptions are now part of config.txt
- alert levels default to the ones I had before, if the config file isn't configured.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2641 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-24 00:50:52 +02:00
fd9c3ad6a8
TG update: Fixed an issue with the captain's laser.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2640 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-24 00:50:52 +02:00
f949f125e4
Command intercept will now only increase the security level if it's lower than blue...
...
Added a keycard authentication device. When you interact with it it asks you which event you'd like to trigger, currently only "Red alert". When you select the event, it asks you to swipe your ID card. If you have the new keycard auth access (60) on it (all heads of staff do), it will trigger all other devices of the same type to flash for 2 seconds. If someone with the same access level on their card swipes their card on another device during this period, the event will happen.
The idea behind this is the two key idea from submarine movies - just with ID cards. Admins are informed who requests the event and who triggers it btw, so abusing this is a bad idea.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2635 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-24 00:50:50 +02:00
35e5698a9c
TG update: Made steel and reinforced glass correctly decrease ore amounts.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2631 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-24 00:50:49 +02:00
d74592c99e
Merge branch 'master' of github.com:Baystation12/Baystation12
2011-12-24 03:34:53 +10:30
803bed1c18
Custom items for special people
...
They have to be manually coded in atm, but someone will no doubt eventually make it use a database when we get that going again (if we don't already)
2011-12-24 03:34:25 +10:30
d539e4b539
Changed the pregame time from 90 seconds to 180 seconds. Delay(admin verb) can now also be used after round end has been announced, to keep the world from rebooting. Also boosted the restart delay from 25 seconds to 60 seconds.
2011-12-22 16:34:10 -08:00
a302464d3b
Merge remote-tracking branch 'upstream/master'
2011-12-23 02:22:39 -05:00
8f53cb2d87
spaceman requested everyone having christmas hats admin verb for possible christmas event. it was possibly a joke I took seriosuly
2011-12-23 02:20:16 -05:00
5964e0dc30
Fixed an obj/machinery/disposal/attackby() runtime error.
2011-12-22 09:11:04 +02:00
cee9634606
stick id's in computer by using id on it, better ear examine text
2011-12-22 01:47:40 -05:00
db806b85d0
improved ear examine phrasing
2011-12-22 01:29:47 -05:00
619ebeba66
updated NT law wording,NT law module in upload,lizards scratch instead of punch via space's rq,fixed downloading books
2011-12-21 03:55:16 -05:00
9f52aef132
Added toggle-godmode, invisibility for Game Admins, BS12 versions of proccall for Game Masters
...
Signed-off-by: Mister Fox <traitor.foxy.brown@live.com >
2011-12-20 08:01:54 -05:00
2dffc6d00d
Merge branch 'master' of git://github.com/Baystation12/Baystation12
2011-12-20 06:43:08 -05:00
9024737097
Merge pull request #126 from MlocMcMloc/master
...
Removing EI NATH and gib-dropping.
2011-12-20 02:57:06 -08:00
d906d1358f
Removed wizard gib spell, make gibbing and dust-ing drop everything on the person.
...
Signed-off-by: Mloc <mloc@mloc.netii.net >
2011-12-20 10:12:51 +00:00
7f540f6811
Merge pull request #121 from SkyMarshal/882fb96574109859b6e503804190390b27e1c738
...
Yet again, check the description.
2011-12-19 08:09:25 -08:00
eebad1184b
Merge pull request #119 from Tastyfish/master
...
added 2 ears! (DNA scan this time!)
2011-12-19 08:08:53 -08:00
35b68d10e1
Automatic guest kicking
...
Signed-off-by: Mister Fox <traitor.foxy.brown@live.com >
2011-12-19 08:30:15 -05:00
1c67be2707
Several fixes/additions. Will list in pull request.
2011-12-18 20:56:39 -07:00
f401c2e9ed
Yes CN, ckey IS all in lower case. Lil' insignificant bugfix on my behalf.
...
Signed-off-by: CompactNinja <kulzernite@hotmail.com >
2011-12-19 01:37:53 +10:30
e85b253eb3
Merge remote-tracking branch 'upstream/master'
2011-12-18 06:12:21 -05:00
e3219fd09d
2 ears!
2011-12-18 06:02:15 -05:00
fda118e9ac
Reworked emag again, new centcom id sprite, removed derpy flavor text.
2011-12-18 03:20:54 -07:00
9c1b83bd88
Fixed some derp.
2011-12-18 00:26:53 -07:00
fc3914364f
Finished pepperspray, added mace item, improved security console, and a few other things. Will know when I see the diffs.
2011-12-18 00:23:02 -07:00
a0298c0477
Should improve pepper spray a bit. Reduced to 2 shot per Hawkie's request.
2011-12-17 18:37:23 -07:00
159ce32cc7
Improved pepper spray, added a safety catch to pepper spray and space cleaner, added a wire to reset the module of a borg.
2011-12-15 23:58:17 -07:00
79ad7d1ae9
Should improve pepper spray, and remove coolness check on detective's revolver
2011-12-15 20:34:36 -07:00
5926961f13
Added a missing food icon
2011-12-14 21:03:23 +00:00
79bb7bdf61
Fixed getting too much sand from a single tile by clicking really fast
2011-12-14 13:02:09 +10:30
8695077f43
display player info -> show player info
...
so that typing "player{tab}{enter}" brings up player panel again
2011-12-14 00:01:13 +10:30
b3edc62393
Added shitty MSPaint recolour of engineering rig for security rig UI (it was using the on-mob sprites)
2011-12-13 01:37:29 +10:30
45fa16929e
Merge #93 cleanup.
2011-12-11 11:11:06 +02:00
4d00ed6890
Merge branch 'master' of github.com:Baystation12/Baystation12
...
Conflicts:
code/defines/mob/mob.dm
code/modules/chemical/Chemistry-Reagents.dm
code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
code/modules/mob/living/carbon/alien/humanoid/life.dm
code/modules/mob/living/carbon/alien/humanoid/queen.dm
code/modules/mob/living/carbon/alien/larva/life.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/monkey/life.dm
maps/tgstation.2.0.8.dmm
2011-12-10 01:11:00 -08:00
0a4ae48ca7
Fixed compile error.
2011-12-11 01:35:57 +02:00
073d160e38
Merge branch 'master' of https://github.com/SHFFLE/Baystation12 into shffle-master
...
Conflicts, manually merged:
icons/mob/suit.dmi
maps/tgstation.2.0.8.dmm
2011-12-11 01:24:42 +02:00
985112f052
Merge pull request #92 from Abi79/master
...
Slurring from Alcohol, btw. Aryn wrote the slur proc
2011-12-10 12:54:45 -08:00
9d774ed3c9
Coffee and black tea now gets rid of the slurriness from alcohol. Also added Cib's slur proc.
2011-12-10 22:33:18 +02:00
412759a35b
Added Security RIG
2011-12-10 12:48:28 -06:00
9dbe06b22b
Added a notes panel that lists all players that have notes on them.
2011-12-11 02:48:02 +08:00
rockdtben