cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-03 04:26:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,606 Commits 11 Branches 2 Tags
7c739e474599ccddee25212399556c9a7eb9a7cc
Commit Graph

4058 Commits

Author SHA1 Message Date
Fox-McCloud 7c739e4745 Merge pull request #710 from ZomgPonies/limb 
Port of the BS12 limb overhaul
 2015-04-05 19:06:39 -04:00
ZomgPonies ca7c6f9db7 Merge pull request #734 from tigercat2000/SuicideActs 
Adds the most important suicide_act (Toy Katana)
 2015-04-05 19:03:35 -04:00
ZomgPonies 430e08574b Merge pull request #729 from SamCroswell/PosterUpdate 
Poster update
 2015-04-05 19:02:46 -04:00
ZomgPonies e733d1caf0 Merge pull request #730 from Fox-McCloud/tweaks-and-tweaks 
[Goonchem] More Additions and Tweaks
 2015-04-05 19:02:18 -04:00
Fox-McCloud fb03e1bc88 updates 2015-04-05 17:54:48 -04:00
Tigercat2000 fcf6f268ee I can type, I swaer! 2015-04-05 23:44:22 +02:00
Tigercat2000 d9613e7a25 Adds the most important suicide_act 
Lolzy suicide_act for the replica katana, as requested by nomzy-xilia
 2015-04-05 22:12:47 +02:00
SamCroswell 8485ae4bab Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into PosterUpdate 2015-04-04 23:05:18 -04:00
SamCroswell 57703695ed Poster Rework Part 3 2015-04-04 23:04:45 -04:00
ZomgPonies c23f2019fe Merge pull request #725 from Fox-McCloud/brain-damage 
Lethal Brain Damage
 2015-04-04 22:07:39 -04:00
ZomgPonies 91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
Fox-McCloud 1a81836556 Lethal Brain Damage 2015-04-04 01:51:04 -04:00
AnturK 2dea395f32 - Adds Picket Signs 2015-04-04 00:07:20 +02:00
SamCroswell 98fd743f6d Adds Poster Supply Packs 2015-04-03 17:15:07 -04:00
SamCroswell c6f5f1f8cd Poster Update 2015-04-03 16:45:44 -04:00
Fox-McCloud ff5ec1df54 meh 2015-04-03 05:32:53 -04:00
Fox-McCloud 0efdc07191 [Goonchem] Few Recipes Tweaks 2015-04-03 01:25:42 -04:00
Fox-McCloud 3bcbd2488c [Goonchem] Few New Reagents 2015-04-02 05:04:20 -04:00
ZomgPonies f7fb4f0376 Merge pull request #703 from Svej/ntrephat 
Nanotrasen Representative hat
 2015-03-30 13:54:26 -04:00
Svej a0e1cd5683 Nanotrasen Representative hat 
Adds a fancy hat to the NT Reps locker
 2015-03-30 14:10:28 +02:00
SamCroswell 63337efdb8 DS Radio and Rapid Deployment Fix 2015-03-29 19:25:32 -04:00
ZomgPonies 7e1f7a0b22 Merge pull request #680 from tigercat2000/spiritboard 
Spirit Boards! (from -tg-)
 2015-03-29 01:02:59 -04:00
ZomgPonies 0b630c4ca7 Merge pull request #691 from jack-fractal/pda_logs 
Adding extra logging information to PDA for refactor prep
 2015-03-29 01:02:05 -04:00
Fox-McCloud 796dbf233a [Goonchem] Tweaks, Fixes, etc. 2015-03-28 21:16:13 -04:00
jack-fractal f62f91f04e Adding extra logging information to PDA 
This significantly expands the level of detail for logging what PDAs.
 2015-03-28 15:32:11 -04:00
ZomgPonies e2a4ccc8a6 Merge pull request #681 from Fox-McCloud/End-Era 
[Goonchem] Transition to Goonchem
 2015-03-28 12:25:35 -04:00
Fox-McCloud 361554d3b2 Forgot Nicotine in cigs 2015-03-28 05:38:15 -04:00
Artorp 046096684b Revert "Change space law iframe wiki link" 2015-03-27 23:53:52 +01:00
Fox-McCloud a40ee14f2c Forgot 2015-03-27 07:19:13 -04:00
Fox-McCloud d1932c0f64 [Goonchem] Transition to Goonchem 2015-03-27 05:41:45 -04:00
Tigercat2000 202f8e81d8 Make actually work, grgrgr. 2015-03-26 21:03:23 +01:00
Cheridan 6796dcce29 Adds logging, fixes typo 2015-03-26 20:11:02 +01:00
Tigercat2000 b4a2d26274 fixstrangestuff 2015-03-26 20:10:45 +01:00
Cheridan d012d77a7d Spirit Boards! 
Conflicts:
	icons/obj/objects.dmi
	tgstation.dme
 2015-03-26 20:00:44 +01:00
Tigercat2000 b8101ed6be w_classes, NEED W_CLASSES, gaah. 2015-03-26 19:21:32 +01:00
Tigercat2000 62f72163c7 Compileerrorfix, update items.dmi 2015-03-26 19:00:25 +01:00
Cheridan acba4c6cf6 Adds construction permits 
Conflicts:
	code/game/gamemodes/objective_items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/paperwork/photography.dm
	icons/obj/items.dmi
 2015-03-26 18:52:29 +01:00
Fox-McCloud d90167193a Merge pull request #670 from ZomgPonies/court 
Adds gavel and block to magistrate
 2015-03-26 11:01:35 -04:00
Fox-McCloud 42d2373c01 Borg Defib Fixes 2015-03-26 01:14:41 -04:00
ZomgPonies d604a50dd8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into court 
Conflicts:
	icons/obj/items.dmi
 2015-03-25 10:23:14 -04:00
ZomgPonies 7fdfa9c6a7 Adding gavel and block 2015-03-25 10:22:04 -04:00
Fox-McCloud 4d2a77dbf7 Merge pull request #653 from ZomgPonies/headspear 
Sticking heads on spears
 2015-03-25 09:37:36 -04:00
Fox-McCloud b3270fe360 Merge pull request #650 from ZomgPonies/beartraps 
IED fix and trap
 2015-03-25 09:37:08 -04:00
ZomgPonies 17dfe4e481 Merge pull request #668 from Fox-McCloud/Goonchem-Stuffs 
[Goonchem] FirstAid Transitions and Chem Adjustsments+Fixes
 2015-03-25 09:33:21 -04:00
Fox-McCloud 33293763f4 gauze is gauze. Shocker 2015-03-25 09:03:20 -04:00
Fox-McCloud 3e1fac8c94 [Goonchem] FirstAid Transitions 2015-03-25 08:45:36 -04:00
Fox-McCloud dbb04f4dbb [Goonchem] Few Additional Chemicals 2015-03-25 03:50:54 -04:00
Fox-McCloud 84a659605d Merge pull request #663 from Iamgoofball/muh_doctors_delight 
MUH FIXES
 2015-03-25 00:18:05 -04:00
Iamgoofball cea9957062 MUH FIXES 2015-03-24 20:54:59 -07:00
Fox-McCloud b30d3f795f Goonchem Map Changes 2015-03-24 22:48:25 -04:00