cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 8 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

2182 Commits

Author SHA1 Message Date
cib
df4419da1e Changed the genetics manual. 2011-12-30 19:43:01 -08:00
mport2004@gmail.com
ec0cd3b973 Moved a batch of unchecked and a few unused files into the unused folder. 
Remember if your scrolling though the list and something is unchecked it should almost certainly be checked.
Simple animals moved over to the actual mob code area and out of the defines.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2868 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-30 16:43:41 +00:00
SkyMarshal
0fe2cdab96 Added multiple string search to security records, fixed some evidence bag bugginess, fixed problem with the stamp remover. 2011-12-30 09:15:04 -07:00
SkyMarshal
5ab20fdf55 Merge branch 'master' of git://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/objects/items/weapons/papers_bins.dm
	code/game/objects/items/weapons/uplinks.dm
 2011-12-29 10:08:58 -07:00
SkyMarshal
9ad0bc5c89 Can compile, now. 2011-12-29 10:01:19 -07:00
cib
b5f8c930f1 Revert SkyMarshal's last commits since they don't even compile, which means they weren't tested. 
Revert "Alien removal surgery, new traitor item, other stuff."

This reverts commit cc3bc60963.
 2011-12-29 15:15:51 -08:00
SkyMarshal
22d5d2cd3d Small error with the new traitor item. 2011-12-28 23:23:42 -07:00
SkyMarshal
cc3bc60963 Alien removal surgery, new traitor item, other stuff. 2011-12-28 23:15:30 -07:00
petethegoat@gmail.com
b20e4b5fd5 Removed the 418 revolver ammo, on account of it being useless and confusing. 
Added basic stats-tracking for traitor items.
Added corner-conveyors to the mining station~

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2839 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-28 17:30:52 +00:00
Albert Iordache
9219a22f14 Merge branch 'master' of https://github.com/SkyMarshal/Baystation12 into Sky 
Conflicts:
	maps/tgstation.2.0.8.dmm
 2011-12-27 17:08:52 +02:00
Albert Iordache
2092e25983 Merge pull request #147 from Tastyfish/master 
coats, changeling, piano, also admins can delete books, paper/books more robust against dynamic content, custom votes
 2011-12-27 04:26:51 -08:00
petethegoat@gmail.com
b9c3f9ce65 Added Scottzar's emitter projectile sprite. Thanks! 
Fixed some issues with paper.
Slightly adjusted the atmospheric door sprites.
Added some SMES assembly sprites.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2829 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-27 04:19:18 +00:00
SkyMarshal
607db09620 Lotsa stuff. Map update. 2011-12-26 17:59:09 -07:00
uporotiy
ab396f50ac TG update: Added stun, weaken and paralysis-related procs in place of directly editing the vars. Hulk is 5% chance now due to being completely immune to any sort of stunning (will nerf more later). Think that's all but not entirely sure. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2683 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 23:39:45 +02:00
Albert Iordache
1fac967212 TG update: Added the (almost finished) displacer. One minor bug with it to work out, does not actually spawn anywhere though so it shouldn't effect anything. Will try to finish it later tonight. 2011-12-26 20:30:45 +02:00
rockdtben
f38a590009 TG update: Removed a proc that does nothing anymore. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2675 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-26 20:19:12 +02:00
Tastyfish
78ed748eab Merge remote-tracking branch 'upstream/master' 2011-12-26 11:24:39 -05:00
Tastyfish
661888ac11 made paper exploit blocker more robust. i still don't quite want to block images /yet/ 2011-12-26 06:24:13 -05:00
SkyMarshal
02b456d26e Evidence bags now work for things outside of storage containers. 2011-12-26 00:06:44 -07:00
SkyMarshal
de67b05dce More updates. The evidence bags are kinda borked. 2011-12-26 00:03:05 -07:00
SkyMarshal
8ee8875e80 Fixed some bugginess with evidence bags. 2011-12-25 12:37:20 -07:00
SkyMarshal
dd8deae835 Numerous fixes. 2011-12-25 10:57:23 -07:00
ryantennessee@yahoo.com
11dbd27bfc TG update: "Now warns admins when people spray polyacid/space lube (Done for Quarxink)" -- credit to Polymorph 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2657 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-25 14:49:39 +02:00
Albert Iordache
6f23ef6b22 Fixed an evidence bag runtime error and added a few CRASH() checks to /obj/machinery/disposal 2011-12-25 00:59:59 +02:00
petethegoat@gmail.com
24df02ec4a You can now fit basic pipes directly into wall girders. 
You probably won't notice this, but it makes things slightly easier for atmos techs.

Several instances of ReplaceWithFloor changed to ReplaceWithPlating- the floor tiles under walls were annoying me. RCDs now create plating instead of floor also.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2786 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-23 21:09:04 +00:00
VivianFoxfoot@gmail.com
0e310200fc Cyborgs now get a message that their parent AI has had their laws modified. (For Kor) 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2778 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-23 08:31:17 +00:00
vageyenaman@gmail.com
af26ab1c2e Fix for metroids dealing clone damage when they melee attack. Some other fixes too that I can't remember. 
Added logs for smoke.

Nerfed metroid magic.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2776 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-23 03:07:36 +00:00
Tastyfish
619ebeba66 updated NT law wording,NT law module in upload,lizards scratch instead of punch via space's rq,fixed downloading books 2011-12-21 03:55:16 -05:00
vageyenaman@gmail.com
bbed525019 Santa's toy bag! 
Fixed some miscellaneous stuff to prevent round-start crashing.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2758 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-21 07:04:55 +00:00
Tastyfish
376d207435 borgs can mend airlocks, status examine, sinks, manuals 2011-12-20 22:03:48 -05:00
uporotiy
98ea8045ad Upped noslip shoes cost to 3 - they're situational, but they're very powerful in the situation they're used in and it's not that hard to facilitate. 
Captains can't be traitors anymore. This is a placeholder, friday I'll redo that a bit - probably so that captains don't get any traitor equipment (they already have all the everything else for that) and that they can't get steal objectives (re: they already have everything).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2752 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-20 19:22:21 +00:00
MlocMcMloc
7f540f6811 Merge pull request #121 from SkyMarshal/882fb96574109859b6e503804190390b27e1c738 
Yet again, check the description.
 2011-12-19 08:09:25 -08:00
SkyMarshal
1c67be2707 Several fixes/additions. Will list in pull request. 2011-12-18 20:56:39 -07:00
Tastyfish
e85b253eb3 Merge remote-tracking branch 'upstream/master' 2011-12-18 06:12:21 -05:00
Tastyfish
e3219fd09d 2 ears! 2011-12-18 06:02:15 -05: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
SkyMarshal
a0298c0477 Should improve pepper spray a bit. Reduced to 2 shot per Hawkie's request. 2011-12-17 18:37:23 -07:00
quartz235@gmail.com
fc005237c1 MAN I AM JUST SO MANY KINDS OF DERP TODAY 
uploaded an old item.dm, this should be the right one (should be meaning it is because i just made super sure)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2712 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-17 03:19:56 +00:00
quartz235@gmail.com
9acbbe7f1f Fixing a derp in r2704 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2711 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-17 02:57:55 +00:00
quartz235@gmail.com
19b78328f3 Fix for issue 246 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2705 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-16 21:37:42 +00:00
Xenusicelon
419f25c3df Fix for Issue 245 by Quarxink 
http://code.google.com/p/tgstation13/issues/detail?id=245#c0

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2704 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-16 21:04:20 +00:00
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
uporotiy
3f5b76aff0 Added stun, weaken and paralysis-related procs in place of directly editing the vars. Hulk is 5% chance now due to being completely immune to any sort of stunning (will nerf more later). Think that's all but not entirely sure. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2683 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-14 16:38:46 +00:00
kortgstation@gmail.com
523100876a Removed all the Xcom sprites/code 
Removed the gigyas sprite
Removed the Vriska sprite
Added the (almost finished) displacer. One minor bug with it to work out, does not actually spawn anywhere though so it shouldn't effect anything. Will try to finish it later tonight.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2676 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-13 22:48:09 +00:00
rockdtben
024d1b074a -Removed a proc that does nothing anymore. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2675 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-13 12:38:05 +00:00
ryantennessee@yahoo.com
98abc51b5a "Now warns admins when people spray polyacid/space lube (Done for Quarxink)" -- credit to Polymorph 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2657 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-11 04:08:12 +00: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
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
0da1bea7c0 Add BS12 Space Law, remove Gravitational Anomaly event 2011-12-08 13:51:10 -07:00