SkyMarshal
1c67be2707
Several fixes/additions. Will list in pull request.
2011-12-18 20:56:39 -07:00
CompactNinja
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
SkyMarshal
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
Albert Iordache
45fa16929e
Merge #93 cleanup.
2011-12-11 11:11:06 +02: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
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
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
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
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
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
unknown
8f11c4acfb
DO NOT USE.
2011-12-08 17:07:25 -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
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
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
SkyMarshal
68b1be773a
Removed fatness from overeatting
2011-12-06 02:47:50 -07:00
uporotiy
4764cdc990
Aliens:
...
Reworked the code to use a new "plasma" var instead of toxloss for their powers.
Facehuggers are now active for 30 to 60 instead of 3 to 5 seconds.
Aliens can see whether facehuggers are active without needing to examine them.
Changelings:
Ranged sting is now 2 squares-ranged instead of 3 squares.
Space:
Reverted the randomly accessible z-levels back to how they were (derelict and ai sat).
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2627 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 08:30:03 +00:00
Tastyfish
139252dbda
made me accept v/h in form of "me v waves."/"me h shouts!", fixed v/h types of robot emotes, added *help for robots
2011-12-06 00:30:07 -05:00
Tastyfish
571ee5f3de
fixed Load Slot Close button
2011-12-05 14:33:18 -05:00
CompactNinja
dc3ada7c27
Merge pull request #66 from Miniature/master
...
AI freelook stuff - should work perfectly now
2011-12-04 21:45:13 -08:00
Miniature
a7b2110194
AI freelook stuff - should work perfectly now
...
Urist said that /tg/ people got some runtime errors, I have no idea what they got and I haven't got any errors in testing so yeah.
2011-12-05 15:08:52 +10:30
headswe
ec2456a1f0
Merge pull request #60 from Tastyfish/master
...
borgs go beep and janitor borgs can OCD, charge ordering bug fix, flavor text
2011-12-04 15:31:07 -08:00
Tastyfish
c208332942
added Anchorshag's examination flavor text thingy
2011-12-04 15:26:46 -05:00
Miniature
5b15848a07
Made pAIs tell candidates who is requesting.
2011-12-05 04:13:17 +10:30
Tastyfish
bba8104f38
Merge remote-tracking branch 'upstream/master'
2011-12-03 23:33:43 -05:00
Tastyfish
901d7c74af
gave trashbags to janiborgs, beep/buzz emotes, removed abstract charge class from order list
2011-12-03 23:26:56 -05:00
headswe
1392f1100f
Merge pull request #59 from Tastyfish/master
...
made set-observe not make the mob pass out
2011-12-03 15:11:07 -08:00
Tastyfish
772da9b506
made set-observe not make the mob pass out
2011-12-03 16:55:26 -05:00
Miniature
2159409d53
Merge branch 'master' of git://github.com/Baystation12/Baystation12
...
Conflicts:
code/game/vote.dm
Because I did it derpily.
2011-12-03 19:30:28 +10:30
Miniature
f62eccc76b
Merge branch 'master' of git://github.com/Abi79/tgstation13-git
...
Conflicts:
baystation12.dme
code/defines/mob/mob.dm
code/defines/obj/vending.dm
code/game/atom_procs.dm
code/game/dna.dm
code/game/machinery/computer/aifixer.dm
code/game/vote.dm
code/modules/chemical/Chemistry-Machinery.dm
code/modules/chemical/Chemistry-Reagents.dm
code/modules/mob/living/carbon/metroid/life.dm
html/changelog.html
icons/obj/stationobjs.dmi
interface/skin.dmf
maps/tgstation.2.0.8.dmm
2011-12-03 19:28:10 +10:30
Tastyfish
8c596e5c53
added sleeping on logout, willful sleeping, custom event message, slots
2011-12-02 17:28:24 -05:00
CompactNinja
79e8ad760b
AI icon stuff from old code. Also fixed some of Mini's derping.
...
Signed-off-by: CompactNinja <kulzernite@hotmail.com >
2011-12-02 21:18:29 +10:30
CompactNinja
e2f4d44cbd
Added old cyborg module sprites. Cyborgs can now select multiple styles, if there are multiple styles to select from.
...
Signed-off-by: CompactNinja <kulzernite@hotmail.com >
2011-12-02 19:59:11 +10:30
ryantennessee@yahoo.com
ac581158ca
Moved 2 borg chargers from robotics to the maint hallways outside security and medical. Changed around borg module order to make it easier to pick things.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2590 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-02 08:00:16 +00:00
LastBattaWolf@hotmail.com
b00324f430
fix for issue 224 by quarxink desu
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2586 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-01 21:56:08 +00:00
Tastyfish
fc5097929e
Fixed 3+ character slots bug
2011-11-30 23:34:23 -05:00
Tastyfish
0b28c04e8c
Nanotrasen laws, nobody likes you asimov
2011-11-30 19:23:37 -05:00
CompactNinja
13ab6b5e56
Crew manifest on join screen.
...
Signed-off-by: CompactNinja <kulzernite@hotmail.com >
2011-11-30 14:48:14 +10:30
headswe
098ec4138d
Merge pull request #44 from Tastyfish/master
...
Added multiple character slots! ie #31
2011-11-29 16:45:06 -08:00
Tastyfish
719002dbee
Added multiple character slots!
2011-11-29 19:32:07 -05:00
ryantennessee@yahoo.com
b3bf2edb80
Derped the file names. fixing.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2576 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-29 21:18:54 +00:00
