cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 10:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,881 Commits 74 Branches 23 Tags
1c67be2707f357e168a665e8101f92d355a8889a
Commit Graph

1457 Commits

Author SHA1 Message Date
SkyMarshal
1c67be2707 Several fixes/additions. Will list in pull request. 2011-12-18 20:56:39 -07:00
Albert Iordache
1816be90a0 Merge pull request #117 from SkyMarshal/master 
Again, check description.
 2011-12-18 00:28:53 -08:00
SkyMarshal
fc3914364f Finished pepperspray, added mace item, improved security console, and a few other things. Will know when I see the diffs. 2011-12-18 00:23:02 -07:00
Tastyfish
75ddaeb9f9 Merge remote-tracking branch 'upstream/master' 2011-12-17 21:52:05 -05:00
Tastyfish
a741413992 carve books, remove immovable rod/gr3y t1de 2011-12-17 20:46:42 -05:00
SkyMarshal
a0298c0477 Should improve pepper spray a bit. Reduced to 2 shot per Hawkie's request. 2011-12-17 18:37:23 -07:00
Miniature
f0aadd4c70 Merge pull request #112 from Miniature/master 
Sanity checking for secret (step 1 in fixing hideous number of runtimes)
 2011-12-17 05:26:02 -08:00
Miniature
803f79c165 This should lower the hideous number of runtimes we've been having lately. 2011-12-17 23:49:20 +10:30
Albert Iordache
d8d876681e Merge pull request #110 from SkyMarshal/159ce32cc7ed547c2004fcc260c16282a415afbc 
Too long for the title, check the description
 2011-12-17 01:27:00 -08:00
Miniature
8b15283862 Made sandbox not votable 2011-12-16 22:25:02 +10:30
SkyMarshal
159ce32cc7 Improved pepper spray, added a safety catch to pepper spray and space cleaner, added a wire to reset the module of a borg. 2011-12-15 23:58:17 -07:00
SkyMarshal
79ad7d1ae9 Should improve pepper spray, and remove coolness check on detective's revolver 2011-12-15 20:34:36 -07:00
Tastyfish
6dbe431045 bunch of library fixes / improvements 2011-12-14 07:39:03 -05:00
Tastyfish
0e8d32df49 fixed com console security screen 2011-12-13 01:32:03 -05:00
Tastyfish
e9d9864720 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	maps/tgstation.2.0.8.dmm
 2011-12-12 02:23:50 -05:00
Tastyfish
d133fbe61d sleepy pens cost 4 2011-12-12 02:09:16 -05:00
Tastyfish
c3d6d6702a actually did skymarshal's changes to the PDA uplink, he changed the nuke team uplink radio 2011-12-11 21:20:06 -05:00
Miniature
da96fabe25 Fixed json thing 2011-12-12 01:33:47 +10:30
Albert Iordache
b411ecf570 Merge pull request #95 from Strumpetplaya/master 
Greatly increased the chance for breath mask and oxygen tank to spawn in O2 closets
 2011-12-11 00:25:50 -08:00
Albert Iordache
9b42ef2db8 Merge pull request #94 from headswe/master 
Made blob take damage from airbased fire hopefully.
 2011-12-11 00:25:00 -08:00
StrumpetPlaya
5314bd707c Greatly increased the chance for breath mask and oxygen tank to spawn in 
O2 closets.

Also redid Radiation suit change.  It seemed to get messed up by /tg/
update I guess.
 2011-12-11 00:37:54 -05:00
Head
99e2894d01 Made the blob take damage from fire. 2011-12-11 02:21:51 +01:00
StrumpetPlaya
32811b1b9d Fixed runtime error involving cyborgs and fibers. 
Also changed Show Server Revision at Head's request.  Can't really test it
locally so hopefully this is what he meant.
 2011-12-10 11:27:48 -05:00
Albert Iordache
41dedca7b9 Merge pull request #85 from Tastyfish/master 
added categories to QM ordering/request stuff so it isn't a giant several-page list
 2011-12-10 02:42:21 -08:00
Albert Iordache
c68a22f497 Merge branch 'SkyMarshal-764432e' 2011-12-10 12:35:15 +02:00
Albert Iordache
6c992058e4 Code cleanup + gravitational anomaly readded 2011-12-10 11:59:40 +02:00
Albert Iordache
64106be003 Merge pull request #82 from SkyMarshal/3319b22adf33c757fc42aa515bc05db894fd0e90 
Lot of tweaks and fixes, read the description.
 2011-12-10 01:43:34 -08:00
Tastyfish
61ae382c16 added categories to QM stuff so it isn't a giant several-page list 2011-12-10 01:25:27 -05:00
Albert Iordache
3efa552eda Merge branch 'master' of https://github.com/Miniature/Baystation12 into Miniature-master 
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
 2011-12-09 14:56:32 +02:00
SkyMarshal
61d21b3cab Added the ability for borgs to ude departmental radios 2011-12-08 22:02:46 -07:00
unknown
8f11c4acfb DO NOT USE. 2011-12-08 17:07:25 -07:00
SkyMarshal
3319b22adf Remove killbot ref. when you make an ED-209, reversed list order for QM requests and orders. 2011-12-08 15:08:03 -07:00
SkyMarshal
b5018a8aa3 Removed thermals from traitor objectives. 2011-12-08 14:29:21 -07:00
SkyMarshal
dafbfe6edd Replaced an accidentially blanked part of flavor text 2011-12-08 14:25:24 -07:00
SkyMarshal
009d0915bf Removed most other cyanide references. Remade cyanide pills into suicide pills (100 units of Toxin) 2011-12-08 14:22:45 -07:00
SkyMarshal
ff8ca07714 Removed accelerated shuttle launch. 2011-12-08 14:05:14 -07:00
SkyMarshal
6f88b4f981 Forgot to remove the entry from the table the random event switch looks at. 2011-12-08 13:57:26 -07:00
SkyMarshal
0da1bea7c0 Add BS12 Space Law, remove Gravitational Anomaly event 2011-12-08 13:51:10 -07:00
SkyMarshal
d7eb6e4ae6 Remove Cyanide, add Sleepy Pen and Thermals to uplink, remove cloaker 2011-12-08 12:35:10 -07:00
Albert Iordache
dd6ddaa8c3 Revert "removed cloaker" 
This reverts commit 1fa97843f8.
 2011-12-08 15:28:35 +02:00
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
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
Miniature
af301633f6 Merge branch 'master' of git://github.com/Abi79/tgstation13-git 
Conflicts:
	baystation12.dme
	code/defines/obj/vending.dm
	code/game/machinery/vending.dm
	html/changelog.html
	maps/tgstation.2.0.8.dmm
 2011-12-07 07:53:20 +10:30
Albert Iordache
92045315a3 Merge pull request #72 from Strumpetplaya/master 
Security now has maintenance access.
 2011-12-06 09:46:00 -08:00
baloh.matevz@gmail.com
cb19629c18 Wrenches no longer spawn with a random pixel offset to the right. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2628 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-06 14:39:19 +00: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