cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 10:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,424 Commits 26 Branches 2 Tags
617f2b8aec43549bf87fb20aed5c7bd4c42fef13
Commit Graph

1390 Commits

Author SHA1 Message Date
Fox-McCloud
38adfe06a0 Removes Recursive Explosions 2015-03-19 03:23:14 -04:00
SamCroswell
8477d382a7 Merge conflict Fix 
Conflicts:
	icons/mob/suit.dmi
 2015-03-08 20:38:07 -04:00
Fox-McCloud
89f2aea30d Insulated Gloves Fix 2015-03-08 19:12:35 -04:00
SamCroswell
8829a90709 NT Rep + Blueshield Uniform Change 2015-03-08 16:59:01 -04:00
Markolie
80a560d291 Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4 2015-03-08 19:05:36 +01:00
Markolie
b8b0fd13b8 Artvend, merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/response_team.dm
	maps/cyberiad.dmm
 2015-03-08 18:54:13 +01:00
Fox-McCloud
4e4e7ae77f Crayons and Gloves 2015-03-06 21:40:57 -05:00
Markolie
3fcfcbc7bb Select equipment ERT jumpsuit 2015-03-04 19:48:30 +01:00
Markolie
e30d4cc35d Merge branch 'master' of https://github.com/Markolie/Paradise 
Conflicts:
	maps/cyberiad.dmm
 2015-03-04 19:34:21 +01:00
Markolie
9c54d2feaa Central Command access rework 2015-03-04 16:36:17 +01:00
ZomgPonies
10ee512d22 Merge pull request #492 from SamCroswell/dave-NinjaDev 
Removes Space Ninjas
 2015-03-03 21:26:16 -05:00
SamCroswell
b8a9c902a1 Removes Space Ninjas 2015-03-02 19:05:44 -05:00
Markolie
82b96d305f Bug fixes, update quick create object 2015-03-02 21:20:12 +01:00
ZomgPonies
6979cf6089 Merge pull request #477 from Fox-McCloud/Chemistry-Cleanup 
Chemistry Cleanup and Fixes
 2015-03-01 23:08:16 -05:00
Fox-McCloud
3bed31e08c Chemistry Cleanup and Fixes 2015-03-01 16:34:23 -05:00
Markolie
d7a2559065 Bug fixes galore 2015-03-01 20:35:07 +01:00
Mark van Alphen
d89c885a14 Merge pull request #435 from ZomgPonies/fixuns 
Various fixings and additions
 2015-02-27 18:22:35 +01:00
Markolie
20ac07de8d Bug fixes 2015-02-27 17:51:57 +01:00
ZomgPonies
64bd0abd71 Fix mentors seeing MSAY 2015-02-26 21:41:59 -05:00
ZomgPonies
ba1f04e0a0 Bantime fixins 2015-02-26 09:12:32 -05:00
Mark van Alphen
f15f8fb5ae Merge pull request #422 from ZomgPonies/master 
GC fixes
 2015-02-25 17:49:17 +01:00
ZomgPonies
710d60abda GC fixes 2015-02-25 10:58:56 -05:00
SamCroswell
cd7b1a4075 ERT Rework - Part One 2015-02-24 09:47:44 -05:00
Markolie
3f51486ba4 Bug fixes, bot proces controller update 2015-02-24 01:40:43 +01:00
Markolie
72db213067 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/jobs/job/support.dm
	code/setup.dm
 2015-02-22 19:12:11 +01:00
Markolie
982102a407 Standardize mutations 2015-02-22 19:04:43 +01:00
ZomgPonies
b0a3d7e1cc Everyone should have check new players 2015-02-21 09:25:43 -05:00
ZomgPonies
07cdcb3cff Merge pull request #367 from Markolie/master 
Switch copytext and sanitize proc
 2015-02-20 16:22:32 -05:00
Markolie
9fedfc7c62 Switch copytext and sanitize proc 2015-02-20 22:17:13 +01:00
ZomgPonies
bb1d0c7a71 IC fax & comms console wrong staff 2015-02-20 14:28:39 -05:00
Markolie
d8d1670b68 Revert "Revert "Saycode/language/species port from Bay"" 
This reverts commit d54579850c.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
 2015-02-20 17:46:35 +01:00
Tigercat2000
826ccaed70 Extra Freeze features- Prevent direct touching and pulling 2015-02-20 05:16:03 +01:00
Tigercat2000
4345506c9c Merge branch 'master' of github.com:ParadiseSS13/Paradise into FreezeMob 
Conflicts:
	code/modules/admin/admin_verbs.dm
 2015-02-20 03:52:58 +01:00
DZD
212ca5f5bd MERGE CONFLIIIIIICTS 2015-02-19 20:26:36 -05:00
ZomgPonies
d54579850c Revert "Saycode/language/species port from Bay" 2015-02-19 20:15:42 -05:00
DZD
d0d6c8eebd Merge with upstream/master 
Fixes merge conflicts.
 2015-02-19 19:38:48 -05:00
ZomgPonies
043a5e0e31 Merge pull request #331 from Markolie/master 
Saycode/language/species port from Bay
 2015-02-19 19:07:25 -05:00
ZomgPonies
69a7d19380 Compile fix & Latejoin heads get added to target lists 2015-02-18 16:27:46 -05:00
ZomgPonies
a780eccdaf Check Antagonist Rev Extra Head Bug 2015-02-18 16:02:25 -05:00
DZD
4bcdb94a99 Merge with upstream/master 
Fixes conflicts
 2015-02-18 13:41:32 -05:00
DZD
fbd9c367c0 NODROP flag addition & handling 
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
 2015-02-18 13:22:41 -05:00
Mark van Alphen
b407810e07 Merge pull request #324 from ZomgPonies/rev 
New +MENTOR permission for mentors
 2015-02-18 16:15:44 +01:00
ZomgPonies
6558590cb3 Fixed MAX SCIENCE moved admin verbs around 2015-02-18 09:21:31 -05:00
ZomgPonies
97f80d0f5b Merge pull request #323 from Fox-McCloud/Sounds 
Sounds
 2015-02-17 18:44:54 -05:00
Markolie
21926c9e48 Part 1 of saycode/language/species port from Bay 2015-02-17 23:20:50 +01:00
ZomgPonies
91b0a3553f Check new players to mentors and view variables to mods and up 2015-02-17 15:12:55 -05:00
Tigercat2000
4be671c80e In accordance with MarkvA's recommendation, switches 'world' to 
'mechas_list'.
 2015-02-17 18:17:10 +01:00
Tigercat2000
d23d8af778 Port of freeze mob verb from NSS Pheonix 2015-02-17 18:04:31 +01:00
ZomgPonies
e2060f405e Downgrade list of potential ahelp subjects to 2: Complaint or Question 2015-02-17 09:21:22 -05:00
ZomgPonies
efe13b39bd Remove msay from mentors 2015-02-17 09:12:43 -05:00