1657e3a9dc
Changing portable air pump volume from 750 to 2500 (3.33 x current).
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2625 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-06 01:28:28 +00:00
dc3ada7c27
Merge pull request #66 from Miniature/master
...
AI freelook stuff - should work perfectly now
2011-12-04 21:45:13 -08:00
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
99407ea862
fixed me ooc color derp
2011-12-04 23:00:16 -05:00
414cfbe8c1
Uncommented erro's code, reticked erro's code.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2620 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-05 02:02:35 +00:00
025288d4eb
Commenting out erro's broken code until he fixes it so no compilation errors
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2619 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-05 01:48:48 +00:00
84b471361e
let admins (space) change ooc color, fixed cryo in tgstation map post-base merge
2011-12-04 18:52:47 -05:00
44c0cfc46d
-Adding pepper spray for security officers.
...
-Fixed a storage bug for chemsprayers and space cleaner
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2618 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 22:42:18 +00:00
962919f6e0
- Added the ability to communications computers to switch between the blue and green security levels. I wanna make a super special way to get to the red level, which involves the turning of multiple keys (id cards) in multiple areas :)
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2615 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 20:32:30 +00:00
c208332942
added Anchorshag's examination flavor text thingy
2011-12-04 15:26:46 -05:00
430cca3300
(GIVE POLYBLUE COMMIT ALREADY) Headrevs can no longer be borged, and revs who get borged are dereved.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2614 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 19:55:01 +00:00
58b573ceec
Committing grenade fix
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2610 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 10:17:13 +00:00
145625b699
Cleaned up some more sounds and prepped ambistat.ogg and ambibar.ogg for their future as title music
...
(For PolyBlue) Flashbangs now affect people in lockers
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2608 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 08:45:39 +00:00
a2d6e59f18
Security levels commit 2
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2607 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 06:50:37 +00:00
bba8104f38
Merge remote-tracking branch 'upstream/master'
2011-12-03 23:33:43 -05:00
901d7c74af
gave trashbags to janiborgs, beep/buzz emotes, removed abstract charge class from order list
2011-12-03 23:26:56 -05:00
9c872b28e1
Reinforced metal renamed to steel, since that what it now is.
...
Steel floor tile renamed to metal floor tile to avoid confusion before it even happens
Grass plants in hydro will now actually make grass floor tiles instead of really awkward patches
You can no longer make steel via autolathe, you can however make metal, and inserting r-metal will still give you metal for use in the lathe
Added 10 sheets of steel to EVA and 10 units of steel to engineering
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2604 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 03:55:58 +00:00
ea9302e213
My side of the Christmas update.
...
Removed the RCD's ability to take down r-walls.
Updated the changelog.
Slight update to stack construction in preparation for buildable light fixtures.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2602 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-04 03:14:07 +00:00
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
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
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
56220098b8
Merge pull request #58 from Miniature/master
...
Merged with /tg/ code.
2011-12-03 12:54:47 -08:00
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
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
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
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
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
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
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
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
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
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
ryantennessee@yahoo.com