baloh.matevz
0f2f9038f4
Fixed the player panel not opening, bug caused by r2658
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2667 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-12 03:09:00 +00:00
VivianFoxfoot@gmail.com
8469753da5
Fire now does four times as much damage, to make it so that running through a blaze is now likely a fatal enterprise. Firesuit still offers protection.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2664 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-11 22:03:08 +00:00
uporotiy
8ede0b3fc6
Fixed a few derps in Poly's commit (namely, the revert back to public vars instead of procs).
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2662 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-11 12:18:38 +00:00
Albert Iordache
45fa16929e
Merge #93 cleanup.
2011-12-11 11:11:06 +02:00
VivianFoxfoot@gmail.com
df1d12c368
Adds a cooldown to changeling lesser form. (30 seconds)
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2659 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-11 08:31:45 +00:00
VivianFoxfoot@gmail.com
09186455a1
Shows the job a player was assigned and the job currently on their ID (if they have one) on the admin player panel. (Done for Hawx_v3)
...
Also, first commit! Yayyyyyy!
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2658 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-11 04:41:42 +00:00
vageyenaman@gmail.com
87bc81ced5
Small changes and bugfixes:
...
◦ Metroids can now be observed by ghosts.
◦ Saved User Interface preferences ("Old UI" & "New UI") now correctly get transferred to clones.
◦ Captain announcements now require the player to be next to the console. (Issue 220)
◦ Radio headsets no longer sometimes fail to deliver the messages (Issue 221)
◦ Some other insignificant back-end shenanigans.
◦ The pregame lobby now has title music. The gameticker chooses between two .ogg files on game start and plays that for everyone who joins. The music stops when create_character() gets called though.
◦ Gave some critters, namely "creature" and "blob" some attack sounds.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2655 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-10 19:34:49 +00:00
rockdtben
c2eaca7b29
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-10 14:36:08 +00:00
rockdtben
46685aba5b
Removed some redundant checks
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2652 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-10 14:14:48 +00:00
cib
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
Albert Iordache
0a4ae48ca7
Fixed compile error.
2011-12-11 01:35:57 +02:00
Albert Iordache
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
CIB
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
Albert Iordache
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
SHFFLE
412759a35b
Added Security RIG
2011-12-10 12:48:28 -06:00
cib
9dbe06b22b
Added a notes panel that lists all players that have notes on them.
2011-12-11 02:48:02 +08:00
Albert Iordache
2d4e356d8c
Merge pull request #86 from CIB/master
...
Made some improvements to the player info panel
2011-12-10 06:22:22 -08:00
Albert Iordache
e72ae5e8f6
Added a new slurring variable, and set it up in the right places
2011-12-10 14:25:49 +02:00
Albert Iordache
c68a22f497
Merge branch 'SkyMarshal-764432e'
2011-12-10 12:35:15 +02:00
Albert Iordache
5d2dfbcff7
Thermals now look like regular sunglasses. Added some special engineering emergency oxygen tanks to engineering.
2011-12-10 12:29:02 +02:00
Albert Iordache
64106be003
Merge pull request #82 from SkyMarshal/3319b22adf33c757fc42aa515bc05db894fd0e90
...
Lot of tweaks and fixes, read the description.
2011-12-10 01:43:34 -08:00
cib
5a3320f30f
Added a notes panel that lists all players that have notes on them.
2011-12-09 17:45:13 -08:00
cib
d970d2b4f9
Added a drunk variable and a text filter specifically for drunk talking, originally coded by Aryn.
2011-12-09 16:44:13 -08:00
cib
3a27c74b46
Some small improvements to the player info panel.
2011-12-09 15:12:01 -08:00
ryantennessee@yahoo.com
b8ef575274
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-09 20:33:25 +00:00
SkyMarshal
764432e4e8
Fixed minor errors.
2011-12-08 22:13:51 -07:00
SkyMarshal
61d21b3cab
Added the ability for borgs to ude departmental radios
2011-12-08 22:02:46 -07:00
cib
11bf4a45a5
Added a "player info" option to the player panel that will allow you to make notes on a specific player etc.
2011-12-08 20:43:20 -08:00
kortgstation@gmail.com
f22a97e982
Added a mint food item/sprite which contains mint toxin
...
Added mint toxin, a poison which will gib fat people upon consumption
Added the mint to the chefs kitchen.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2648 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-09 04:26:15 +00:00
Albert Iordache
ae34949324
Merge branch 'master' of github.com:Baystation12/Baystation12
2011-12-09 18:58:32 +02:00
Albert Iordache
3efa552eda
Merge branch 'master' of https://github.com/Miniature/Baystation12 into Miniature-master
...
Conflicts:
code/modules/mob/living/carbon/alien/humanoid/life.dm
code/modules/mob/living/carbon/alien/larva/life.dm
2011-12-09 14:56:32 +02:00
Tastyfish
afd1aca53b
let everyone do me emotes properly! (bots,monkeys,...)
2011-12-09 02:24:33 -05:00
ryantennessee@yahoo.com
08347ddb01
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-09 01:22:01 +00:00
ryantennessee@yahoo.com
24d262f19d
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-09 01:01:37 +00:00
unknown
8f11c4acfb
DO NOT USE.
2011-12-08 17:07:25 -07:00
SkyMarshal
009d0915bf
Removed most other cyanide references. Remade cyanide pills into suicide pills (100 units of Toxin)
2011-12-08 14:22:45 -07:00
SkyMarshal
d7eb6e4ae6
Remove Cyanide, add Sleepy Pen and Thermals to uplink, remove cloaker
2011-12-08 12:35:10 -07:00
Albert Iordache
dd6ddaa8c3
Revert "removed cloaker"
...
This reverts commit 1fa97843f8 .
2011-12-08 15:28:35 +02:00
Albert Iordache
00e8e13d1e
Merge pull request #76 from Tastyfish/master
...
The closet tg merge broke charge crates
2011-12-08 05:27:20 -08:00
baloh.matevz@gmail.com
b30bfac8f9
- added feedback logging for alert levels
...
- alert level descriptions are now part of the config file config.txt
- alert levels default to the ones I had before, if the config file isn't configured.
- Restored a HTML vending machine interface, an updated one. (I have limited time so I'll commit this one too, it's part of the bundle i coded while offline today and I don't have time to separate it before discussing it. I'll revert it later if needed)
Vending machine demo:
http://www.kamletos.si/vending.html
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2641 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-08 11:09:01 +00:00
n3ophyt3
141977983c
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-08 06:28:16 +00:00
Uristqwerty
74c2b7c55b
Stealth PM fix: hide stealthmin names in the input box title.
2011-12-07 12:50:05 -05:00
Tastyfish
1fa97843f8
removed cloaker
2011-12-07 12:29:04 -05:00
baloh.matevz@gmail.com
d1f2c54b17
(forgot one file, but also sending the log from the previous commit)
...
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.
Added this to the changelog. Hopefully the dme will work properly this time.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2635 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-07 00:55:20 +00:00
baloh.matevz@gmail.com
8636f28d7d
In response to the problems of miner inactivity and a suspicion of the steel change affecting robotics in that mechs, specifically ripleys will no longer be built, I have included some stats logging about mecha construction and mineral production.
...
Also 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-06 22:33:23 +00:00
Miniature
af301633f6
Merge branch 'master' of git://github.com/Abi79/tgstation13-git
...
Conflicts:
baystation12.dme
code/defines/obj/vending.dm
code/game/machinery/vending.dm
html/changelog.html
maps/tgstation.2.0.8.dmm
2011-12-07 07:53:20 +10:30
Miniature
5fec6c6319
DM why you so shit
2011-12-07 07:46:08 +10:30
Albert Iordache
9dc2644e51
Commented out more of the fat code, for issue #71 .
2011-12-06 19:23:25 +02:00
Albert Iordache
6a62c3b8ff
Merge pull request #71 from SkyMarshal/master
...
Removed obesity upon overeating
2011-12-06 08:48:06 -08:00
uporotiy
df04d75c48
Aaaaaaaaaand once again I forget to upload a new file.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2629 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 15:04:11 +00:00