cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-17 12:32:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,064 Commits 8 Branches 26 Tags
f1fcbf3445f3e48ef57cb5abdcca6a2ee9efa35f
Commit Graph

409 Commits

Author SHA1 Message Date
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
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
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
Tastyfish
376d207435 borgs can mend airlocks, status examine, sinks, manuals 2011-12-20 22:03:48 -05: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
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
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
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
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
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
Tastyfish
68c6b97fd3 everyone cult!, paper label 2011-12-05 23:19:39 -05:00
uhangi@gmail.com
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
LastBattaWolf@hotmail.com
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
uhangi@gmail.com
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
LastBattaWolf@hotmail.com
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
petethegoat@gmail.com
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
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
Tastyfish
0b28c04e8c Nanotrasen laws, nobody likes you asimov 2011-11-30 19:23:37 -05: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
vageyenaman@gmail.com
1d255c8f8e Changelings can no longer have their DNA modified at all through any means (except adminfuckery perhaps). Sorry, you can't clone changelings now through UI+SE abuse! Borg them instead. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2566 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-28 03:41:45 +00:00
kortgstation@gmail.com
e3d8fe0b78 Husks can be borged again (if traitors have to hide bodies to avoid being tattled on by a clone, changelings can deal with it as well. You can change faces as well if you'e really worried about being caught) 
Changeling genome requirement lowered from 8-12 to 6-12 (APPROVED BY MUSKETS COME AT ME URIST)

Regen stasis now heals cloneloss (in case you suffer a metroid accident)

Added a "summon creature swarm" spell for later use in cult.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2565 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-27 23:25:56 +00:00
petethegoat@gmail.com
2190408f0f Massively improved trashbags. PICK UP EVERYTHING! Fixed issue 209. 
Slightly improved mops, and got rid of the "X attacks the blood with the mop!" message.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2557 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-26 15:58:50 +00:00
rockdtben
1de1be054d Implemented more getters/setters for damage system. 2 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2556 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-26 13:33:18 +00:00
Baystation12
c1cc954e94 Merge pull request #22 from Tastyfish/master 
Merged tg's and bay12's paper code, and closed a possible exploit.
 2011-11-24 03:21:07 -08:00
Tastyfish
cc14ed34a5 Merged best of tg's and bay12's paper code, and closed a possible exploit 2011-11-23 23:09:18 -05:00
kortgstation@gmail.com
38c25cbbe7 Re-added PALADIN to the upload because people were complaining (corporate is still there though) 
Fixed corporate having null origin tech

Fixed the desc on the science goggles fuck you superxpdude dont touch my shitty gimmick items without asking

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2541 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-22 11:11:58 +00:00
StrumpetPlaya
593e380133 Screen flashes red when hit by melee or projectiles. 2011-11-20 02:54:48 -05:00