cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 17:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,856 Commits 74 Branches 23 Tags
cfbc3e5352c9680cfaa74a4d3d3e332b51af6464
Commit Graph

2738 Commits

Author SHA1 Message Date
Chinsky
cfbc3e5352 Added webbing and vests to lockers. 2013-06-05 21:35:56 +04:00
Zuhayr
9e71180e1b Merge conflict resolution, using BEF. 2013-06-05 14:22:04 +09:30
Spamcat
c5a57ccdc4 Runtime fixes, tweaks. 2013-06-04 16:25:41 +04:00
Aranclanos
799ed74a3c Made the effects of EMP pulses get garbage collected. Less lag on the singularity (around 20 effect del per 5~10 seconds) 2013-06-04 13:47:26 +04:00
rockdtben@gmail.com
8203e7dced Push sparks lag to GC this should greatly reduce lags. 
Test: 20 emitters shooting for 10 minutes. No lag. Along with other various tests.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5757 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-06-04 13:30:07 +04:00
Chinsky
abc2e6b96b Merge pull request #2903 from fauxki/bleeding-edge-freeze 
DON'T MERGE - BEF - Bar / Holodeck / Theatre / Hydroponics Revamp
 2013-06-03 01:59:33 -07:00
Segrain
3d41e24664 Minor tweaks to spawning medical clothes. 2013-06-02 23:01:33 +03:00
VitrescentTortoise
5bcb4f4bcb Added hidden fingerprint to crayon drawings. 2013-06-01 16:19:48 -07:00
Mloc
77832af5ae Merge pull request #2940 from comma/whistle 
Whistle
 2013-06-01 07:45:56 -07:00
Chinsky
63f9549596 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into whistle 
Conflicts:
	baystation12.dme
 2013-06-01 17:12:51 +04:00
Chinsky
3bbb250749 Added bloody footprints. 2013-06-01 14:30:05 +04:00
Chinsky
89fff29db1 Showed that huge proc in /atom what polymorphism' is. 
Now instead of huge condition line it's handled where it was supposed to be handled.
 2013-06-01 12:24:43 +04:00
Chinsky
0b9c904252 DRY BLOOD FOR THE BLOOD GOD. 
Blood will now dry up in around half an hour.

Also moved blood drip define out of disposals. WTF.
 2013-06-01 10:56:59 +04:00
Chinsky
6de8060545 Added hailers to the Sec closets. 2013-06-01 08:34:31 +04:00
MisterBook
606a510168 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-05-31 22:58:01 -05:00
Chinsky
4794fc4d1e Merge pull request #2933 from Furlucis/master 
Fixes and tweaks for Obscure, Reveal and Seer runes, plus some amount of floundering around with git
 2013-05-31 20:09:10 -07:00
Chinsky
de4f4e4788 Merge pull request #2927 from Baystation12/master 
Merging master to BEF
 2013-05-31 19:49:13 -07:00
Furlucis
24098c6529 UNadded robotic hands and feet because there was no point in doing this in the first place. 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-05-31 22:32:39 -04:00
Furlucis
e32b253a41 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-05-31 20:01:57 -04:00
MisterBook
25d5600d19 Cobpipe fix 
Smoking pipe icon fix.
Eye-stab admin logging fix.

Tasers now do halloss, representing non-lethal PAIN.
http://baystation12.net/forums/viewtopic.php?f=5&t=7773

Tasers now check their target's limb for armor, and deflect if armored (Represented by coeffecient = 0).
http://baystation12.net/forums/viewtopic.php?f=5&t=7772

Attempting to merge with BEF
 2013-05-31 00:21:48 -05:00
MisterBook
06b7700086 Cobpipe fix 
Smoking pipe icon fix.
Eye-stab admin logging fix.

Tasers now do halloss, representing non-lethal PAIN.
http://baystation12.net/forums/viewtopic.php?f=5&t=7773

Tasers now check their target's limb for armor, and deflect if armored (Represented by coeffecient = 0).
http://baystation12.net/forums/viewtopic.php?f=5&t=7772
 2013-05-31 00:09:00 -05:00
Segrain
3409e1f05d Toolbelts can hold engineering tape. 2013-05-30 19:35:03 +03:00
Segrain
50f05f7a11 Pill bottles can hold paper. 
For prescriptions and such.
 2013-05-30 19:28:34 +03:00
fauxtada
f367d7de19 Bar / Holodeck / Theatre / Hydroponics Revamp 
- http://baystation12.net/forums/viewtopic.php?f=20&t=7692
- Added six new fields to the holodeck. Theatre, Meeting Hall, Picnic Area, Snow Field, Space Walk, and Desert.
- Added a Hydroponics Pasture that houses animals for botany. The Chef and Botanists have access to this area.
- Theatre was removed from the bar, replaced with bar. Chef was given an area to lay food out on, and more tables were added for sitting at. Had to move some disposal pipes around and the nav beacons. *crosses fingers* They probably work?
- Removed dispatcher uniform from closet, since it is being used as a general replacement security uniform. And that made Chinsky mad...
- Fixed airless tiles under airlocks.
- Replaced duplicate medical records computer behind medbay desk with Nanomed Plus.
- Pun Pun now has a different monkey sprite from the rest.
 2013-05-29 20:24:29 -07:00
VitrescentTortoise
2b689fa3f0 Gave nuke agents magboots. 2013-05-28 21:34:26 -07:00
Chinsky
d45073a5ab Added new item - hailer. Use in hand to make it say HALT! SECURITY! 
Should help in asking people to halt while running.
 2013-05-28 03:12:58 +04:00
Furlucis
08524aa4d2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-05-27 01:48:44 -04:00
cib
cab1289511 Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	html/changelog.html
 2013-05-26 20:43:22 +02:00
Chinsky
13e2d8d793 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-05-26 05:02:07 +04:00
meyar
1d5d7cb901 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-05-24 06:52:03 -04:00
meyar
c1e701f32b Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
 2013-05-24 05:23:36 -04:00
Kilakk
ef2c7af6a0 Telescopic baton message fix. 
Fixed first- and third- person extend/collapse messages for the
telescopic baton, woo
 2013-05-23 16:24:53 -04:00
cib
b5217d862a A few fixes to rp-rev 
- Name was empty, hopefully using real_name fixes that
- Announcements coming too quickly
- Fixed icon path issue
 2013-05-23 22:12:20 +02:00
cib
ce19719700 Fixed two problem with airlock/APC commit: 
- Debugger now sends messages to user instead of usr(whoops)
- Can now close emagged door with crowbar so you can take out circuit
- Couldn't weld emagged doors
- Replacing the circuitry should now be sufficient to fix an emagged door.
 2013-05-23 19:47:33 +02:00
cib
aa6bfc33c7 Airlock and APC changes. 
- Added a debugger device that can figure out when an object has been hacked/emagged
- Hacked APCs no longer display blue screen
- You can now disassemble emagged airlocks, they will yield a fried airlock electronic.
 2013-05-23 16:43:29 +02:00
Chinsky
bdb16b1f99 Renamed bruise pack back to gauze. 
STAY LIKE THAT.
 2013-05-22 14:05:53 +04:00
Chinsky
1b0c6b942a NOW IT COMPILES. 
Incomplete rename.
 2013-05-21 18:08:28 +04:00
meyar
ebe2e26ed3 Fixes the Syndicate nuke shuttle airlock (In that it cycles now) 
Re-added external airlock access to the traitor ID card, restoring lost functionality.
Fixed the ERT radio. It now works.
 2013-05-19 05:00:06 -04:00
cib
f5b0b52b6c Added stasis bag. 
This stops all life functions of a patient for a while. It can only be used once, and inflicts low amounts of brain and clone damage over time.
 2013-05-19 07:48:43 +02:00
Chinsky
6c062dc05c Merge pull request #2793 from meyar/master 
Fixin' the traitor ID
 2013-05-18 06:11:46 -07:00
faux
6e85a3ed42 Master Bug Fixes 
- Fixes wall under maintenance tunnel door.
- Fixes AAAAHHHHHHHRRG psych office pressure issue.
- Fixes some names and DMIs on some items. (in theory)
 2013-05-18 05:57:21 -07:00
meyar
c170f57ba7 Returns lost functionality to the traitor ID, letting a traitor re-forge their ID more than once. 2013-05-18 06:48:01 -04:00
Mloc
5faabba7fb Merge branch 'master' into bleeding-edge-freeze 
Conflicts:
	html/changelog.html

Signed-off-by: Mloc <colmohici@gmail.com>
 2013-05-16 12:21:55 +01:00
fauxtada
2b9130b00f Quick Fixes 
- Changed access to security washroom so detective can go in.
- Removed wall that was under maintence tunnel door.
- Fixed writerer's custom item. AGAIN. .. Because they can't decide what character they want it on.
- Added saloon dress to bar closet.
 2013-05-15 11:26:26 -07:00
Cael_Aislinn
749d3eeaa0 transit pods should reverse direction when they reach the end of the tube 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-14 13:10:28 +10:00
fauxtada
5b2f03db10 Map Fixes - BEF 
- adjusts the piping and flooring panels in the new security wing.
- fixes the piping around the new eva since they lead to nowhere.
- adjusted the medbay lobby a bit, added a second chair behind the front desk.
- added in a xenos closet. has unathi items / wooden sandals in it currently. still need to sprite up the tajaran and skrell items.
 2013-05-11 09:33:45 -07:00
Mloc-Argent
849ec5052a Fix for compiling on case sensitive filesystems. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-05-06 16:09:10 +01:00
Mloc-Argent
27759f47df Merged master into BEF. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-05-06 15:43:50 +01:00
fauxtada
cdb3466cd9 may or may not fix issue of missing sprite for captain's uniform jacket. 2013-05-02 03:19:23 -07:00
fauxtada
fed2bfcedc fixed michael guess' zippo, added therapy doll dmis to code, the items aren't coded because i cannot get it to work for the life of me. 2013-05-02 02:00:04 -07:00