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

2511 Commits

Author SHA1 Message Date
d3athrow
d7b67f6b16 This wasn't needed apparently. 2014-05-28 08:45:44 -04:00
ZomgPonies
06bbfcf150 Final Nations patch before live testing. This is going to be painful. 2014-05-27 20:09:10 -04:00
d3athrow
c50eb1217b Tested and Fixed #826 
Conflicts:
	code/game/objects/items/stacks/stack.dm
 2014-05-27 14:21:57 -04:00
ZomgPonies
9bf41d3405 4th Nations commit, Finished framework. Rest of gameplay code is within the flag object's attackby and dropped procs. 2014-05-27 01:20:20 -04:00
ZomgPonies
3c9dbcc822 First commit for nations gamemode, setting up the framework I'll be using. 2014-05-26 20:02:20 -04:00
ZomgPonies
581376e191 Nuke ops fixes 2014-05-26 17:57:39 -04:00
ZomgPonies
f36e5d206c Fix secborg tasers 2014-05-26 16:29:03 -04:00
Zuhayr
f97f7cedcc Lots of work on hardsuits, commented out some broken WIP code, did some renaming, deleted now-redundant species-specific hardsuits. 
Conflicts:
	code/game/machinery/suit_storage_unit.dm
	code/game/objects/items.dm
	code/game/objects/items/devices/modkit.dm
	code/modules/clothing/masks/breath.dm
	code/modules/clothing/spacesuits/alien.dm
	code/modules/clothing/spacesuits/rig.dm
 2014-05-26 13:58:17 -04:00
mwerezak
516bed9ddd Fixes bodybags not being able to be put back... 
...into their own box. Also affects folded cryobags.
 2014-05-26 06:21:43 -04:00
ZomgPonies
f6a9016f34 Unathi flag in, waiting on spears and burning in-hands for the remaining flags. 2014-05-25 22:14:54 -04:00
ZomgPonies
aa4f29c5e8 Only one flag to go! 2014-05-25 21:34:25 -04:00
ZomgPonies
1c02329ef4 Machine people/synthetics flag 2014-05-25 18:54:37 -04:00
ZomgPonies
f184c8fd5c On-fire in-hand for all current flags 2014-05-25 16:57:59 -04:00
ZomgPonies
f3d04ab657 You can now set flags on fire -- in-hands on fire missing 2014-05-25 15:39:12 -04:00
ZomgPonies
aab6cb2430 Adds Vox and Pony flags 2014-05-25 11:50:08 -04:00
ZomgPonies
dae3e2d5e8 Adds Skrell and Ninja flags 2014-05-25 05:36:12 -04:00
ZomgPonies
7bbac52dc8 Moar flags 2014-05-25 03:03:16 -04:00
ZomgPonies
11a1deb1ac Trying to cut down on attack lock spam 2014-05-24 17:17:38 -04:00
ZomgPonies
497a113bf3 Atmosia flag! All departments are covered...now to code nations gamemode. 2014-05-24 14:32:51 -04:00
ZomgPonies
55de2b38a7 Wizard flag 2014-05-24 13:09:10 -04:00
ZomgPonies
08b69878f7 Only atmosia flag left to do! 2014-05-24 12:27:55 -04:00
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
769214e535 Refactored flags, added in excellent Clown Planet flag by Wubbledaddy 2014-05-24 07:48:29 -04:00
ZomgPonies
838d746d6e Added an NT flag as decoration and added it to a bunch of places. ALL GLORY TO NANOTRASEN! 2014-05-19 04:36:59 -04:00
cloroxygen
c8b1fd08de 21 viro symptoms 
Im an idiot that cant use github edition

Conflicts:
	code/game/objects/effects/decals/Cleanable/humans.dm
	code/modules/virus2/effect.dm
 2014-05-17 19:17:35 -04:00
Rob Nelson
a2cfa562b3 Fix UI syringes not setting UI flag correctly. 2014-05-15 20:10:47 -04:00
jack-fractal
2754b56e0c adding the spirit entity code, fixing the cameraNet so that it compiles properly 
Conflicts:
	code/datums/visibility_networks/dictionary.dm
	code/game/machinery/doors/door.dm
	code/modules/mob/living/silicon/ai/freelook/cameranet.dm
 2014-05-15 05:06:38 -04:00
Jeremy Liberman
bd249e3a53 Mutiny Mode 
Conflicts:
	code/__HELPERS/time.dm
	code/controllers/hooks-defs.dm
	code/controllers/hooks.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/podmen.dm
	code/modules/admin/player_panel.dm
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
	code/modules/security levels/keycard authentication.dm
	code/setup.dm
	icons/mob/mob.dmi
 2014-05-15 01:01:54 -04:00
alex-gh
b6b5e0a9fc Changed drone laws to be more VG like 2014-05-13 02:44:31 +02:00
Zuhayr
1af09fbfba Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable. 
Conflicts:
	baystation12.dme
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/modules/projectiles/guns/projectile/bow.dm
	icons/obj/gun.dmi
 2014-05-12 02:59:53 -04:00
Zuhayr
d606d774d8 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing. 
Conflicts:
	baystation12.dme
	code/controllers/configuration.dm
	code/game/objects/items/weapons/AI_modules.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/examine.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/recycling/disposal.dm
	icons/mob/robots.dmi
	icons/obj/device.dmi
 2014-05-12 01:41:02 -04:00
SamCroswell
666a953c6c Requested Map Changes 2014-05-05 19:57:16 -04:00
MrPerson
320a06f8c9 Make sure clones don't already have a body 
CASE: Guy gets backed up at genetics. Guy gets facehugged. Guy pops as a xeno. Guy gets cloned. Alium is left clientless.

Conflicts:
	code/game/machinery/cloning.dm
 2014-05-04 17:06:20 -04:00
ZomgPonies
fbb53d240c Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-05-04 16:32:18 -04:00
Jarcolr
e3b27e3ecd Cyborg hud modules now have proper icons 
Before: http://puu.sh/8yK5W.png
After: http://puu.sh/8yKYc.png

Conflicts:
	code/game/objects/items/robot/robot_items.dm
 2014-05-04 16:31:49 -04:00
ZomgPonies
679f0fe293 Merge pull request #194 from SamCroswell/master 
Nukeops Weapons Rework
 2014-05-04 15:43:03 -04:00
SamCroswell
2d44352d0f Misc. changes 2014-05-04 09:37:28 -04:00
SamCroswell
521467fa3e C4 now explodes on detonation, Stechtkin pistol fix 
The Stechtkin pistol now works properly, C4 will now create a small
(Welder tank) sized explosion upon being detonated.
 2014-05-04 02:28:06 -04:00
ESwordTheCat
3c3e4c7dc8 Heh forgot these. 2014-05-03 22:54:24 -04:00
ESwordTheCat
532298c725 Tweak object pool system. 
Conflicts:
	code/game/objects/structures/grille.dm
	code/modules/projectiles/projectile/beams.dm
	code/modules/projectiles/projectile/bullets.dm
	code/modules/projectiles/projectile/special.dm
 2014-05-03 22:54:09 -04:00
Zuhayr
e79097add3 Several IPC adjustments. 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
 2014-05-03 17:42:01 -04:00
Zuhayr
31e95baa78 Fixes for previous commit, sigh. 2014-05-03 17:38:01 -04:00
Zuhayr
75d8633fbe Adding some repair procs to cables and welders for IPC use. 
Conflicts:
	code/modules/power/cable.dm
 2014-05-03 17:37:46 -04:00
Zuhayr
7fe9b670f3 Fix for previous commit. 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
 2014-05-03 17:35:55 -04:00
Zuhayr
9ec5a18e0b IPC will no longer take damage from walking in glass. Not sure why this was happening beforehand. 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
 2014-05-03 17:34:43 -04:00
ZomgPonies
36b52731f0 Changing power numbers to balance gun upgrades 2014-05-01 16:23:09 -04:00