Tastyfish
1fa97843f8
removed cloaker
2011-12-07 12:29:04 -05:00
Tastyfish
e51459600f
Merge remote-tracking branch 'upstream/master'
2011-12-07 11:21:50 -05:00
Albert Iordache
51a55e4f7c
Merge pull request #78 from Strumpetplaya/master
...
Cloning fixed.
2011-12-07 03:07:35 -08:00
Albert Iordache
6a445ebd28
Merge pull request #73 from Abi79/master
...
Removed more fat code
2011-12-07 03:05:29 -08:00
StrumpetPlaya
79c84c9d23
Cloning fixed.
2011-12-07 05:40:33 -05:00
Tastyfish
455b61d9c8
hand labelers have been broken since the first commit..
2011-12-07 00:32:02 -05:00
Tastyfish
14f0a4d0b9
UnRevert "the closet tg merge broke my charge crates"
...
This reverts commit 2694238e88
2011-12-06 21:04:41 -05:00
Tastyfish
ecb6f2b2d6
Revert "the closet tg merge broke my charge crates"
...
This reverts commit 2694238e88
2011-12-06 21:00:08 -05:00
Tastyfish
ac627aa521
Merge branch 'master' of github.com:Tastyfish/Baystation12
2011-12-06 20:36:20 -05:00
Tastyfish
2694238e88
the closet tg merge broke my charge crates
2011-12-06 20:35:07 -05:00
Albert Iordache
92045315a3
Merge pull request #72 from Strumpetplaya/master
...
Security now has maintenance access.
2011-12-06 09:46:00 -08:00
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
StrumpetPlaya
508df5d3cb
Nobody spawns with internals anymore.
2011-12-06 07:35:33 -05:00
StrumpetPlaya
4489db546d
Added detective stuff - fibers.
...
Left out bloody footprints for now. Not sure we want that with the
current system of corpses dropping blood spatters all around when dragged.
2011-12-06 07:12:19 -05:00
StrumpetPlaya
bbd04aa2aa
Security now has maintenance access.
...
Security also has access to medical/research hallways.
Assistants no longer have maintenance access.
2011-12-06 06:04:34 -05:00
SkyMarshal
68b1be773a
Removed fatness from overeatting
2011-12-06 02:47:50 -07: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
68c6b97fd3
everyone cult!, paper label
2011-12-05 23:19:39 -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
Miniature
80c40ada96
Merge pull request #65 from Tastyfish/master
...
fixed my ooc color derp
2011-12-04 20:06:59 -08:00
Tastyfish
99407ea862
fixed me ooc color derp
2011-12-04 23:00:16 -05:00
CompactNinja
cd6bdc968e
Merge pull request #64 from Tastyfish/master
...
let admins (space) change ooc color, fixed cryo in tgstation map post-merge
2011-12-04 15:56:19 -08:00
Tastyfish
84b471361e
let admins (space) change ooc color, fixed cryo in tgstation map post-base merge
2011-12-04 18:52:47 -05:00
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
Miniature
5543fe749f
Animals as captains? Human supremacy!
2011-12-05 01:34:36 +10:30
Miniature
a3e7e394ad
Switched charge amounts for automatically turning off machinery and lights, so lights turn off before machinery (like on old code).
2011-12-04 22:52:20 +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
Albert Iordache
56220098b8
Merge pull request #58 from Miniature/master
...
Merged with /tg/ code.
2011-12-03 12:54:47 -08:00
Albert Iordache
d97e62ecd8
Modified the transmission delay to 0, to allow people to broadcast on the radio at the same time.
2011-12-03 23:01:30 +02: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
fa13653159
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2011-12-02 19:59:33 +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
Miniature
e1a254c34f
Fixed a silly, and no mode votes while round is in progress, more .gitignore (*.lk, info.json)
2011-12-02 15:47:42 +10:30
n3ophyt3
67e43e4baf
New toy, as coded by Threadstrong.
...
A delightful fake sunflower, that also doubles as a squirtgun. Refillable via watertanks.
Currently adminspawn only because I am too lazy to make it spawn anywhere right now.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2589 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-02 01:51:40 +00:00
n3ophyt3
b8abae2eba
Fixed the recharge rates on the captain's laser, energy crossbow, and advanced energy gun.
...
pulse rifles can once again switch between stun, kill, and destroy (outside of the pulse destroyer, which has three settings, and they are all destroy)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2588 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-02 00:33:21 +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
petethegoat@gmail.com
a80e46c078
Fixed issue 222.
...
Improved closet/secure closet/crate code a bit. (Updated the paths on the map.)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2585 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-01 20:02:43 +00:00
LastBattaWolf@hotmail.com
29a3acab5c
quickfix to make ambimalf play less often
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2584 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-01 09:37:47 +00:00
Tastyfish