cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-20 14:32:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,611 Commits 28 Branches 2 Tags
463537e9a202110f2d9abcd85be13119fcee9701
Commit Graph

12677 Commits

Author SHA1 Message Date
ZomgPonies
463537e9a2 Bunch of new flags. 2014-05-24 11:38:32 -04:00
ZomgPonies
029ce0b1ca Syndi flag + more flag organizing. 2014-05-24 10:56:48 -04:00
ZomgPonies
162b936bd3 Fixed up in-hands and flags and shit jesus fucking BYOND christ 2014-05-24 10:40:38 -04:00
ZomgPonies
e1ce0ee664 Errr 2014-05-24 09:15:26 -04:00
ZomgPonies
b4f5df6d1d Made flags unable to fit in backpacks. 2014-05-24 09:11:27 -04:00
ZomgPonies
f5e69887a1 Fix Taj/Unathi/Whatever skin color. Let FurryRaveStation13 continue! 2014-05-24 08:24:09 -04:00
ZomgPonies
c25b72b83e Merge pull request #220 from Regen1/Hyperzine-fix 
Hyperzine fix
 2014-05-24 07:52:42 -04:00
ZomgPonies
769214e535 Refactored flags, added in excellent Clown Planet flag by Wubbledaddy 2014-05-24 07:48:29 -04:00
Regen
4b94406efb Nerfs for OD 2014-05-23 23:10:04 +02:00
ZomgPonies
d099ca5a19 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-05-23 14:32:01 -04:00
ZomgPonies
fac32af2f1 First commit of liquid simulation stuff 2014-05-23 14:31:29 -04:00
Regen
d6702496f9 Hyperzine fix 
Now lasts shorter and isn't deadly at 5 units
 2014-05-23 17:33:34 +02:00
alex-gh
be8d9eb026 Fixed spaceacillin metabolism, its useful again 2014-05-23 10:53:26 +02:00
ZomgPonies
6faa9e3be9 Forgot this 2014-05-23 02:18:41 -04:00
ZomgPonies
a521f88e95 Final dodgeball fixes 2014-05-23 01:15:24 -04:00
ZomgPonies
cbd1148d12 Every round ender needs a good theme song. TODO: Switch all these to play from a global jukebox in streaming. 2014-05-23 00:06:46 -04:00
ZomgPonies
e191f93767 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-05-22 23:50:23 -04:00
ZomgPonies
20184bb9cd Ccomp fixes to mesons 2014-05-22 23:49:57 -04:00
Mloc-Argent
1b2f83dee4 BS12 Hooks 2014-05-22 23:56:35 +02:00
ZomgPonies
a2a50586b0 Trying to fix dodgeball 2014-05-22 15:49:34 -04:00
ZomgPonies
0c1a77e346 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-05-22 14:21:47 -04:00
ZomgPonies
342f8c4042 Fixed up Highlander and Dodgeball 2014-05-22 14:21:29 -04:00
Regen
7c710186e2 Armalis bugfixes 
Also slightly changed admin chat color again
 2014-05-22 18:57:33 +02:00
alex-gh
3281c5f150 Merge pull request #213 from alex-gh/mutiny_fixes2 
Mutiny fixes? 3
 2014-05-21 16:33:06 +02:00
alex-gh
d14d253414 Mutiny fixes? 3 
Attempt to fix mutiny by replacing .Add() and .Remove() with += and -=
 2014-05-21 16:30:49 +02:00
UristMcKerman
8c24a36298 Canister will close valve when tank ejected 
I wonder why nobody did it before.

Conflicts:
	code/game/machinery/atmoalter/canister.dm
 2014-05-20 23:37:30 -04:00
ZomgPonies
408379ab6a vg economy overhaul 2014-05-20 22:51:02 -04:00
ikarrus
b385ed83b5 -Added checks to prevent the nuke disk from leaving z1 
-If the disk is deleted while it's inside a nuke, the nuke will lock itself

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/turfs/space/space.dm
 2014-05-20 21:32:37 -04:00
ikarrus
c139fa22a1 Objects being pulled will transition with mobs changing Z-levels via space 2014-05-20 21:25:01 -04:00
ZomgPonies
69725d9466 Revert "Refactored, simplified access system a bit. Tested, for once." 
This reverts commit a5e65d9b2b.
 2014-05-20 20:58:23 -04:00
Regen
3959cbd634 Changed color of Asay to a more notable one 2014-05-20 23:18:29 +02:00
ZomgPonies
557a97f0fc Tied gravity to the actual grav generator 2014-05-20 22:59:25 +02:00
ZomgPonies
7bf3f18cce Renamed Atmos Tech to life support specialist due to new grav gen responsabilities 2014-05-20 22:59:24 +02:00
UristMcKerman
9f201399e6 Quick fix to TEG 
When one of TEG circulator intakes had gas while the other had no (null)
the air in the first used to be deleted. Fixed this behavior.
 2014-05-20 22:59:24 +02:00
UristMcKerman
e77d058ffe Added heat radiation to H/E pipes 
Added black-body heat radiation to H/E pipes placed over /turf/space
according to Stephan-Botzmann law

Conflicts:
	code/ATMOSPHERICS/he_pipes.dm
 2014-05-20 22:59:23 +02:00
Rob Nelson
a5e65d9b2b Refactored, simplified access system a bit. Tested, for once. 
* Mobs provide GetAccess() and hasFullAccess()
 * Human GetAccess() provides the "best" accesses available combined from all conventional sources.\
 * Silicons have hasFullAccess()
 * AdminGhosts also provide full access.

Conflicts:
	code/game/jobs/access.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/mob.dm
	html/changelog.html
 2014-05-20 22:59:23 +02:00
alex-gh
dc48050c02 Fixed broken time definitions 2014-05-20 22:59:21 +02:00
alex-gh
7179b422d9 Fixed broken time definitions 2014-05-20 18:16:56 +02:00
Regen
1cb87e07cf Made Cyanide more deadly, added OD to Hyperzine 
Because fuck those who OD on Hyperzine, and Cyanide needs to kill faster
(not like cyanide is used by anyone else than Nukeops anyways)
 2014-05-20 16:43:35 +02:00
alex-gh
ac20f7ace3 Merge pull request #208 from alex-gh/mutiny_fixes2 
Re-added mutiny fixes
 2014-05-20 13:09:08 +02:00
ZomgPonies
9e89c8cdcb Mutiny fixes 
Conflicts:
	code/game/gamemodes/mutiny/mutiny.dm
	code/game/objects/items.dm
 2014-05-20 13:06:59 +02:00
alex-gh
5066000778 Replayed mutiny fixes 2014-05-20 13:01:15 +02:00
UncleSporky
75114a326a Adds the Guy Fawkes mask to Autodrobe and spawn 
Conflicts:
	code/game/machinery/vending.dm
	code/game/objects/effects/landmarks.dm
	code/modules/clothing/masks/miscellaneous.dm
	icons/mob/mask.dmi
	icons/obj/clothing/masks.dmi
 2014-05-20 06:39:19 -04:00
Robson Richards
e9885bdd4d Adds Nienhaus's Sprites (Again) 
Conflicts:
	code/unused/powerarmor/powerarmor.dm
	code/unused/powerarmor/powerarmorcomponents.dm
	icons/mob/feet.dmi
	icons/mob/hands.dmi
	icons/mob/head.dmi
	icons/mob/suit.dmi
 2014-05-20 06:16:29 -04:00
ZomgPonies
1a33066817 Quickfix 2014-05-20 02:16:27 -04:00
ZomgPonies
27b9da70a7 Changing mechanics bay to new system 2014-05-20 01:58:24 -04:00
Vas
22a22ea6bc Space Adaptation was actually BAD instead of GOOD (overdose with reagents) 
Conflicts:
	code/modules/virus2/effect.dm
 2014-05-19 19:39:29 -04:00
ESwordTheCat
a6ee8dc678 Revert gun pool for now. 
Conflicts:
	code/game/machinery/turrets.dm
	code/modules/projectiles/projectile/beams.dm
 2014-05-19 19:34:20 -04:00
alex-gh
54db12f702 Merge pull request #206 from alex-gh/mutiny_fixes 
Merged latest mutiny fixes.
 2014-05-19 19:56:10 +02:00
alex-gh
4dc1e5c0b3 Merged latest mutiny fixes. 2014-05-19 19:54:42 +02:00