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
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
8c596e5c53
added sleeping on logout, willful sleeping, custom event message, slots
2011-12-02 17:28:24 -05:00
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
fa13653159
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2011-12-02 19:59:33 +10:30
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
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
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
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
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
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
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
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
fc5097929e
Fixed 3+ character slots bug
2011-11-30 23:34:23 -05:00
e86db35be0
Merge pull request #50 from Tastyfish/master
...
Nanotrasen laws, nobody likes you asimov
2011-11-30 18:37:45 -08:00
0b28c04e8c
Nanotrasen laws, nobody likes you asimov
2011-11-30 19:23:37 -05:00
5cdbb88c03
Merge pull request #48 from Miniature/master
...
Made security able to be traitors (AI and cyborg still can't)
2011-11-30 16:07:01 -08:00
41346a6828
Merge pull request #49 from Tastyfish/master
...
Added vending charges, removed clown/mime from main joblist, sec belts
2011-11-30 16:06:38 -08:00
b344e2a442
Merge remote-tracking branch 'upstream/master'
2011-11-30 18:35:58 -05:00
26e1bfdaf1
Added vending charges, removed clown/mime from main joblist, sec belts fixed
2011-11-30 18:34:43 -05:00
af1041f4b7
Added some more ambiance
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2583 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-30 23:24:13 +00:00
363b929216
Made security able to be traitors (AI and cyborg still can't)
2011-12-01 07:52:40 +10:30
514d4e15d9
Cryotubes & freezers work from any direction.
...
Mappers, make sure the direction is set correctly!
Updated the map so the existing freezers ain't broke.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2582 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-30 17:05:56 +00:00
789dded1bf
Merge branch 'master' of github.com:Baystation12/Baystation12
2011-11-30 17:51:03 +01:00
73b9b7a481
Just a minor modification to the topic.dm
2011-11-30 17:49:35 +01:00
80607987da
Quick fix to stop gamemode votes restarting the world if they finish before round start.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2581 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-30 16:01:22 +00:00
85cb13fe95
Reverted the janitor closet to the old trashbag. (It does work, I fixed it up in r2557.)
...
A bunch of fixes for various stuff that's been broken about the bag of holding. It should work as intended, now.
Made wet floor signs fit in boxes.
Cleaned up the janitor's closet a bit.
Optimised the vault wiring a bit.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2580 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-30 15:02:01 +00:00
2883e40c19
Added additional transfer amount options to the medborg's inoprov and anti-tox vials.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2579 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-30 06:49:40 +00:00
763c0ecf71
Can now make light tubes/bulbs in the autolathe
...
Old trashbag was buggy as fuck and useless. Didn't touch it's code, but replaced it's spawn in the janitors locker with a 20 slot, tiny item only storage object (new trashbag)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2577 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-30 05:35:40 +00:00
13ab6b5e56
Crew manifest on join screen.
...
Signed-off-by: CompactNinja <kulzernite@hotmail.com >
2011-11-30 14:48:14 +10:30
098ec4138d
Merge pull request #44 from Tastyfish/master
...
Added multiple character slots! ie #31
2011-11-29 16:45:06 -08:00
1f9774b827
Merge remote-tracking branch 'upstream/master'
2011-11-29 19:33:29 -05:00
719002dbee
Added multiple character slots!
2011-11-29 19:32:07 -05:00
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
a728ae8863
Changed medborgs to hold 1 pill each of dexalin, anti-toxin, kelotane, and bicaradine. Added bicardine pill to chemistry tools. Added borg recharging station to medical, security, and janitor closet.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2575 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-29 21:14:37 +00:00
f426d9b5df
Merge pull request #42 from Miniature/master
...
Arrivals scanner
2011-11-29 09:25:09 -08:00
e1df14b5c1
Forgot to call makejson()
2011-11-29 18:15:49 +01:00
15fa196907
AI Freelook
2011-11-30 01:31:22 +10:30
1c01524055
Arrivals scanner stuff, now has sprite, new name, and uses power
...
Just needs jobban stuff, then should be fine to add to a map
2011-11-30 01:19:41 +10:30
43d71282e0
Added back json support / restart notice
...
should fix unnecessary restart after gamemode change before round start
2011-11-29 15:45:01 +01:00
d4ae76820b
Fixedish the arrivals scanner, still need to add circuitboard to it
2011-11-29 22:57:57 +10:30
fbf18ddd7e
Arrivals scanner
2011-11-29 22:57:35 +10:30
0e129ba6ce
No more random end sounds
2011-11-29 22:50:29 +10:30
9179612571
Merge pull request #36 from Tastyfish/master
...
Auto-flush disposals, auto-hush vending machines
2011-11-29 02:14:31 -08:00
26093c367e
Merge remote-tracking branch 'upstream/master'
2011-11-29 02:51:52 -05:00
e58dd6030f
Auto-flush disposals, auto-hush vendending machines
2011-11-29 02:42:08 -05:00
f003685c57
Commented out talking vending machines, as they are fucking annoying.
...
Signed-off-by: CompactNinja <kulzernite@hotmail.com >
2011-11-29 16:49:09 +10:30
2ac5d5aa94
Merge pull request #34 from Tastyfish/master
...
changes company name, game-mode minimums
2011-11-28 21:36:38 -08:00
e89488975f
we work for NanoTrasen! Also, we don't have enough people for your fancy
...
15-person minimums
2011-11-29 00:19:37 -05:00
6df7528b16
Bunch o hair stuffs.
...
Signed-off-by: CompactNinja <kulzernite@hotmail.com >
2011-11-29 14:03:52 +10:30
Miniature