cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-16 00:26:56 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,362 Commits 17 Branches 2 Tags
12675d12d28fa5aa57ff0b1cbd2dfec8ff0ce553
Commit Graph
348 Commits
Author SHA1 Message Date
Tastyfish 58c3d6ebe3 cleaned up brain transfer 2012-01-09 01:24:42 -05:00
Tastyfish 409da96055 can operate on heads to get the head out now, also skin color 2012-01-09 01:06:16 -05:00
Tastyfish 1d010aca75 Merge remote-tracking branch 'upstream/master' 2012-01-08 20:06:03 -05:00
Tastyfish ce9042ae20 bones and dismemberment 2012-01-08 20:05:54 -05:00
SkyMarshal 145b3d3b5f Tweaked flamethrowers slightly, made the UI actually do something and fixed an icon that was not updating. 2012-01-07 11:19:04 -07:00
SkyMarshal 40a0a5499e Bugfix for some table stuff I forgot. 
Fixed a small message for writing on paper.
 2012-01-07 10:51:32 -07:00
Tastyfish c4f5429857 furthur work on bones 2012-01-06 16:41:47 -05:00
Tastyfish abd22255f3 Merge remote-tracking branch 'upstream/master' 2012-01-05 17:15:33 -05:00
Tastyfish a7b85707dd porting in bones and dismemberment 2012-01-05 17:15:29 -05:00
cib 9e035424da Nerfed the medbot and bruise packs. 2012-01-05 19:36:26 -08:00
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
uporotiyandAlbert Iordache 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
rockdtbenandAlbert Iordache 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.comandAlbert Iordache 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