cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-05 05:23:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 15 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

1969 Commits

Author SHA1 Message Date
Fox-McCloud 63352fcfc2 Merge pull request #479 from ZomgPonies/darkness 
The Ghostsight the server deserves
 2015-03-02 00:57:12 -05:00
ZomgPonies 86e300bc67 Fixes Ghostsight for realsies 2015-03-01 19:10:25 -05:00
Markolie d7a2559065 Bug fixes galore 2015-03-01 20:35:07 +01:00
Markolie 23da335c32 Malf AI old turret z level check 2015-03-01 04:33:33 +01:00
Markolie de255425d6 Malf turret upgrade fix 2015-03-01 04:26:02 +01:00
Markolie 20a0ac7e35 Adjust nuke ops skin tone again 2015-02-28 19:56:30 +01:00
Markolie 8ee485d46e Fix Vox heist objectives 2015-02-28 18:10:42 +01:00
Markolie a735e6855c Reduce malf ticker time, update fire damage, fix breathing 2015-02-28 15:44:43 +01:00
Markolie 0ce4e6b40a Blob sound fix 2015-02-27 18:04:13 +01:00
Markolie 20ac07de8d Bug fixes 2015-02-27 17:51:57 +01:00
ZomgPonies d14c4e4f58 Merge pull request #431 from Fox-McCloud/Lasers-Tasers 
Laser Additions and Taser Nerf
 2015-02-26 22:49:46 -05:00
Fox-McCloud 9850e6deb2 Laser Additions and Taser Nerf 2015-02-25 23:34:42 -05:00
Markolie bfe8a12f1e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/objects/items/weapons/kitchen.dm
 2015-02-25 20:44:32 +01:00
Markolie e1f0d0fec7 Bug fixes, add atmos watertank 2015-02-25 19:47:04 +01:00
ZomgPonies 9ca2500cf3 Merge pull request #414 from Markolie/master 
Mapfix, hivemind fix
 2015-02-24 19:48:36 -05:00
Markolie da05274bf4 Mapfix, hivemind fix 2015-02-25 01:13:53 +01:00
ZomgPonies ef7fe5a181 Optimizing lobby stuff 2015-02-24 11:22:12 -05:00
ZomgPonies 859c907962 Merge pull request #396 from Markolie/master 
Bug fixes, bot process update
 2015-02-24 08:01:25 -05:00
Markolie 544910f449 Rebalance nuke ops skin color a bit 2015-02-24 01:58:23 +01:00
Fox-McCloud 6fba118892 Merge remote-tracking branch 'upstream/master' into Fixes 2015-02-23 16:47:55 -05:00
Mark van Alphen 8457375738 Merge pull request #391 from ZomgPonies/schedule 
Goon process scheduler
 2015-02-23 19:46:17 +01:00
Fox-McCloud 96a941ba19 Fixes and Guns 2015-02-22 16:32:35 -05:00
Markolie 672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
ZomgPonies 2c50a42ba7 Goon process scheduler 2015-02-22 15:24:46 -05:00
Markolie 377dfe894d Add attack animations 2015-02-22 21:15:54 +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
Markolie 3b072b5a62 Remove click delay from most things 2015-02-22 18:47:58 +01:00
ZomgPonies 1c1ebc3f3f Merge pull request #383 from Fox-McCloud/Syndi-Hardsuits 
Syndi hardsuits
 2015-02-22 08:27:38 -05:00
ZomgPonies bb620841a1 Merge pull request #375 from Fox-McCloud/Thickmaterial 
Thickmaterial
 2015-02-22 08:26:02 -05:00
ZomgPonies c91558b095 Merge pull request #379 from Markolie/master 
Bug fixes
 2015-02-21 15:02:56 -05:00
Markolie d2dcb7a041 Fix AI tracking, atmospherics construction, blob talk fix, ERT radio fix 2015-02-21 20:56:55 +01:00
ZomgPonies 54791c57b5 Emergency: Removing WHISPER disability which infinite loops 2015-02-21 12:35:06 -05:00
Fox-McCloud 2a1028324c Thickmaterial Flag 2015-02-21 07:26:25 -05:00
Mark van Alphen d126a98527 Merge pull request #371 from TheDZD/changeling 
Changeling Bugfixes
 2015-02-21 02:32:26 +01:00
ZomgPonies dd79cb9ef2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-02-20 19:26:30 -05:00
Markolie ed21396340 Fix absorb language update 2015-02-21 01:15:25 +01:00
DZD 5e977cbfc9 Merge remote-tracking branch 'upstream/master' into changeling 2015-02-20 19:05:25 -05:00
ZomgPonies cfd9c09f0a Adds COMIC mutation and gives it to clown 2015-02-20 18:43:09 -05:00
Markolie 9fedfc7c62 Switch copytext and sanitize proc 2015-02-20 22:17:13 +01:00
Markolie c89e3ac1eb Revert "Revert "Emergency communications hotfix"" 
This reverts commit 3ea36839a8.
 2015-02-20 17:59:07 +01: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
Fox-McCloud be2e754706 Syndicate Rebalance 2015-02-20 03:14:12 -05:00
DZD 2e848c2c37 Merge remote-tracking branch 'upstream/master' into changeling 2015-02-19 20:59:41 -05:00
DZD 8193c0ab8e Makes things compile 2015-02-19 20:47:57 -05: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
DZD c11bb0d283 Fixes bugs 
- Tables can't have NODROP or ABSTRACT items placed on them anymore,
same for lockers and crates.
- Fixes a runtime with trying to strip a NODROP or ABSTRACT item.
 2015-02-19 19:32:58 -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