cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-31 04:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,209 Commits 2 Branches 1 Tag
f78e044226bbe00a2e93b2cabc1a495c2143f6a9
Commit Graph

422 Commits

Author SHA1 Message Date
Tastyfish
bf877d0483 Merge pull request #191 from SkyMarshal/master 
Nuclear revamp, full details in description.
 2012-01-02 08:18:25 -08:00
CaelAislinn
9fa489a0d1 finished autolathe changes. added stationary, box and empty supply crates to supply shuttle. 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-02 21:38:27 +10:00
SkyMarshal
d64e8284f6 Fixed implanter problems, added some more silly emotes. 2012-01-01 19:57:57 -07:00
SkyMarshal
d2bae46c39 Changed functionality of implanter. 2012-01-01 19:25:02 -07:00
SkyMarshal
755d2d711a Nuke revamp, some tweaking. 2012-01-01 18:58:28 -07:00
SkyMarshal
1c54c8b20f Bugfix for alien removal surgery 2011-12-30 19:03:29 -07:00
cib
df4419da1e Changed the genetics manual. 2011-12-30 19:43:01 -08: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
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