baloh.matevz@gmail.com
f9badcefe1
It is no longer possible to make reinforced metal from metal sheets or vice versa. The reason for this is on Pete's side. The intention is to make RCD's not able to take down r-walls, however at the same time make r-walls harder to make.
...
The way you make reinforced metal now is by using the mining processing unit. The recipe is a combination of metal and plasma ore.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2601 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 03:05:44 +00:00
LastBattaWolf@hotmail.com
855b087f38
(Committed for PolymorphBlue) Traitors in the prison cell on the escape shuttle now fail their objective.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2599 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 02:37:19 +00:00
uhangi@gmail.com
1136054925
Fucked up, NOW space is depowered.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2598 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 01:27:44 +00:00
uhangi@gmail.com
ab779def53
Depowered space
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2597 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 00:11:40 +00: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
petethegoat@gmail.com
c6d94edb84
Fixed up some of the APC construction/deconstruction messages.
...
Changed the popcorn sprite to one that doesn't suck, by Cheridan.
Updated dat changelog.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2596 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-03 17:26:16 +00:00
petethegoat@gmail.com
5d4b707553
Fixed all known problems with vending machines.
...
Fixed a minor visual bug with emagged lockers.
Minor botany rebalance by Numbers.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2595 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-03 15:36:17 +00: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
petethegoat@gmail.com
598fe6e961
r2593: LASTY BROKE EVERYTHING PANIC EDITION
...
But it's okay we still love you.
(fixed some missing apostrophes that were causing compile errors)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2594 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-03 03:06:54 +00:00
LastBattaWolf@hotmail.com
a6ac7c7f31
shuffled some sounds around to help counteract the SUDDEN CUTOFF issue when leaving an area
...
experimenting with throwing in actual music to certain areas (bar and possibly lounge in the future), will remove it if it doesn't really work out or fit well
removed some stuff that isn't getting used, everything I've removed since five or six months ago is sitting in a .rar under the downloads tab
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2593 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-02 22:52:30 +00:00
Tastyfish
8c596e5c53
added sleeping on logout, willful sleeping, custom event message, slots
2011-12-02 17:28:24 -05:00
ryantennessee@yahoo.com
186fbad7fd
Fixed spelling error in /obj/item/stack/tile/steel singular name.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2592 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-02 18:37:53 +00: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
fc5097929e
Fixed 3+ character slots bug
2011-11-30 23:34:23 -05:00
headswe
e86db35be0
Merge pull request #50 from Tastyfish/master
...
Nanotrasen laws, nobody likes you asimov
2011-11-30 18:37:45 -08:00
Tastyfish
0b28c04e8c
Nanotrasen laws, nobody likes you asimov
2011-11-30 19:23:37 -05:00
headswe
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
headswe
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
Tastyfish
b344e2a442
Merge remote-tracking branch 'upstream/master'
2011-11-30 18:35:58 -05:00
Tastyfish
26e1bfdaf1
Added vending charges, removed clown/mime from main joblist, sec belts fixed
2011-11-30 18:34:43 -05:00
LastBattaWolf@hotmail.com
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
Miniature
363b929216
Made security able to be traitors (AI and cyborg still can't)
2011-12-01 07:52:40 +10:30
petethegoat@gmail.com
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
Head
789dded1bf
Merge branch 'master' of github.com:Baystation12/Baystation12
2011-11-30 17:51:03 +01:00
Head
73b9b7a481
Just a minor modification to the topic.dm
2011-11-30 17:49:35 +01:00
petethegoat@gmail.com
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
petethegoat@gmail.com
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
ryantennessee@yahoo.com
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
kortgstation@gmail.com
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
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
1f9774b827
Merge remote-tracking branch 'upstream/master'
2011-11-29 19:33:29 -05: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
ryantennessee@yahoo.com
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
headswe
f426d9b5df
Merge pull request #42 from Miniature/master
...
Arrivals scanner
2011-11-29 09:25:09 -08:00
Head
e1df14b5c1
Forgot to call makejson()
2011-11-29 18:15:49 +01:00