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

3294 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
769214e535 Refactored flags, added in excellent Clown Planet flag by Wubbledaddy 2014-05-24 07:48:29 -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
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
ZomgPonies
a2b05d96f5 Mutiny fixes 2014-05-15 03:16:48 -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
Erthilo
1685262f31 Allows clothing to appear differently on different species. Needs sprites though. 
Conflicts:
	code/game/objects/items.dm
	code/modules/clothing/under/color.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/species.dm
 2014-05-13 22:47:26 -04:00
ZomgPonies
8237b9cfea Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-05-13 21:57:59 -04:00
Erthilo
288385ba66 Adds vox fitted uniforms and shoes to all jobs excluding sec, mime, and clown. 
Conflicts:
	code/modules/clothing/under/color.dm
	code/modules/clothing/under/jobs/civilian.dm
	code/modules/mob/living/carbon/species.dm
	icons/mob/species/vox_w_uniform.dmi
 2014-05-13 21:57:50 -04:00
alex-gh
640f925ef0 Merge pull request #201 from alex-gh/event_fixes 
Event fixes
 2014-05-13 18:17:03 +02:00
alex-gh
4a7e113cf5 Pyro anomaly tweaks 
Pyro anomaly arrives much later after announcement, making it easier to disable.
Pyro anomaly now produces more plasma.
 2014-05-13 17:20:28 +02:00
alex-gh
b6b5e0a9fc Changed drone laws to be more VG like 2014-05-13 02:44:31 +02:00
Zuhayr
c599199a8e Fixes #4911 2014-05-12 03:11:15 -04:00
Zuhayr
fbbb3b50ce Fixes #4923 2014-05-12 03:10:37 -04: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
Razharas
4b2deebec6 Making datum handling not suck balls too hard 
Yeah now it can roughly be called okish
 2014-05-04 22:56:38 -04:00
Razharas
8ee92a0f81 Removing debug shite 2014-05-04 22:56:01 -04:00
Razharas
95b6406adb Makes this shit actually work 
Yeah, also added crafting controller to debug controllers(who will need
to debug crafting, but whatever)

Conflicts:
	code/controllers/verbs.dm
 2014-05-04 22:55:42 -04:00
Razharas
3d762cd892 Readded the crafting to tables 
Well at least now i can brag about how you can do this with just few
lines

Conflicts:
	code/game/objects/structures/tables_racks.dm
 2014-05-04 22:54:08 -04:00
Razharas
281fbc7648 Made crafting entirely datum 
Now it can be useful
Maybe
Probably
I hope

Conflicts:
	code/_globalvars/lists/objects.dm
	code/game/atoms.dm
	code/game/objects/structures/tables_racks.dm
 2014-05-04 22:47:38 -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
740991092a Nukeops Weapons Rework 
Nukeops now start with a Stechtkin Pistol instead of the C-20r.
In addition, they now have more items available to purchase in their
uplink (Exclusive to Nukeops). They are as follows:
C-20r - 6TC
L6SAW - 10TC
C-20r Mag - 1TC
L6SAW Mag - 3TC
Stechtkin Silencer - 1TC
Advanced Medkit - 3TC

The prices are, of course, subject to change as we observe further
Nukeops rounds.
 2014-05-04 10:24:48 -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
ZomgPonies
610b9b9962 Merge pull request #192 from SamCroswell/master 
Map changes, new ninja masks, more commits possibly to come
 2014-05-03 19:05:46 -04:00
SamCroswell
f4ef7c192b Map changes, new Ninja masks 
Map changes including: RnD layout change, new customs lounge, xenoarch
windows fix, and more. Also added a few new Ninja masks in prep for some
bigger changes I have planned.
 2014-05-03 18:35:10 -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
Brian Cook
a78e54f33f Added missing header to pAI Request Module 
Also changed max frequency of radio config to 159.9 instead of 159.1
 2014-04-29 20:48:49 -04:00
Brian Cook
27a1d25b80 Added refresh button to host bioscan page 
Also tweaked all pAI GUI so the background doesn't repeat-y
 2014-04-29 20:48:39 -04:00
Brian Cook
cd8fb70a0b Centered background on pAI GUIs 2014-04-29 20:48:29 -04:00