cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-20 10:37:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
37,414 Commits 17 Branches 2 Tags
36dec344fac2216804c723aa9dd4aa2d7f4e278d
Commit Graph
345 Commits
Author SHA1 Message Date
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Serket 8930359edc MapMerge/SpeciesCheck 2018-02-11 16:03:27 -07:00
Serket 00d501c7df BugBGone 2018-02-10 12:26:30 -07:00
Tayyyyyyy e720a2b4a6 Oops. Emitter beams should have a green glow 2018-01-25 00:52:24 -06:00
Tayyyyyyy 619f295b11 Add light to lasers 2018-01-22 23:41:16 -06:00
tigercat2000andGitHub 9692d1357c Merge pull request #8374 from Fox-McCloud/shotguns-OP 
Nerfs Shotgun Pellets
 2017-11-30 11:08:24 -08:00
tigercat2000andGitHub 02615c4e43 Merge pull request #8388 from Fox-McCloud/slime-fix 
Fixes Slime Transformation
 2017-11-26 13:03:24 -08:00
Fox-McCloud 0e19a4d00c Fixes Slime Transformation 2017-11-20 12:11:59 -05:00
Fox-McCloud de993b73b3 Nerfs Shotgun Pellets 2017-11-14 00:47:55 -05:00
uraniummeltdown 7ed2c68ea7 compiles, find and replace particle_effect and effect_system 2017-11-04 20:16:01 +04:00
uraniummeltdown a0939ca93b finish making smoke OOP, compiles 2017-11-03 22:46:49 +04:00
Ansari 28de2ec80c Change to a proper boolean 2017-10-10 17:44:32 +08:00
Ansari 29270c1d23 Portal beam no blows. No damage 2017-10-10 17:18:40 +08:00
Crazy LemonandGitHub 1b8af7dc94 Merge pull request #7708 from Fox-McCloud/you-cant-outmeme-memers 
Darts no longer proc reaction
 2017-07-25 10:42:42 -07:00
Fox-McCloud b07eb1a0b5 Refactors Species Flags into Species Traits List 2017-07-13 18:55:45 -04:00
Fox-McCloud e29d346198 Projectile Reflection Refactor 2017-07-06 16:29:40 -04:00
Fox-McCloud 40e5123e42 Darts no longer proc reaction 2017-07-04 21:04:56 -04:00
Fox-McCloud 666fff6e4a useless bullet removal 2017-07-01 20:38:58 -04:00
Fox-McCloud e1cc7e1431 Merge remote-tracking branch 'upstream/master' into so-edgey 2017-07-01 20:17:16 -04:00
Fox-McCloud 05a24da2e8 The Most Non-Edgey PR Ever 2017-07-01 19:48:43 -04:00
Fox-McCloud 04b9394d34 last tweaks 2017-07-01 01:44:02 -04:00
Sam 7c7c8c70cb Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines 2017-06-10 10:16:33 +01:00
Sam 4d57fff5c9 Updates Intents 2017-06-10 09:43:36 +01:00
Kyep ee2eb3eb4b Fox request 2017-06-05 22:07:06 -07:00
Kyep ed3d8cb278 Tweaks instagib lasers 
Instagib lasers now work on non-carbon mobs (such as simple_animals),
and turfs.

No CL, as admin-only.
 2017-06-05 03:55:08 -07:00
DarkPyrolord 5a75998fd8 Bullet fixes, no more rubber shells sticking, or bullet bananas. 2017-05-20 21:54:14 +12:00
Fox-McCloud 31c9519f3e More GC Define Transitions 2017-05-13 04:24:05 -04:00
Crazylemon64 1840074921 Refactors "organs" to be "bodyparts" to end confusion once and for all 2017-04-29 23:23:09 -07:00
Fox-McCloud 0e48b1d3df Nerfs Buckshot 2017-03-04 20:58:35 -05:00
Markolie 7a4c33bbcd Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions 2017-02-06 19:55:37 +01:00
Markolie 2a23862c6a Kinetic accelerator update, other fixes 2017-02-06 18:39:03 +01:00
Fox-McCloud 390f6768b3 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-02-05 05:26:46 -05:00
Markolie 1d7de41acb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/pooling/pool.dm
 2017-01-27 17:28:14 +01:00
Fox-McCloud 51bbe8c466 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-26 06:53:18 -05:00
Crazy LemonandGitHub 0e42e416b6 Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor 
Makes Reagents Holder Process and Refactors NOREACT
 2017-01-26 03:47:30 -08:00
Fox-McCloud d0b378892d Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-23 22:25:00 -05:00
Markolie a7205cfd3e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/projectiles.dmi
 2017-01-23 17:36:37 +01:00
Fox McCloudandGitHub 2af1f9bb79 Merge pull request #6185 from Allfd/Enforcer 
Ports Enforcer handgun, rubber bullets, and new shotgun ammo boxes from Stratus
 2017-01-23 06:08:36 -05:00
Fox-McCloud 7007f6bbdf Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-23 01:01:09 -05:00
Fox-McCloud dc0710135e more fixes 2017-01-23 00:53:44 -05:00
Markolie a50a3d59b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi
 2017-01-20 23:43:35 +01:00
Mieszko Jędrzejczak 1b506aaf9f Switches over to the new system 2017-01-17 13:57:07 +01:00
Alffd 3fbc81cea7 Ports Enforcer handgun, rubber bullets, and new ammoboxes. 2017-01-15 21:13:22 -05:00
Fox-McCloud ea8080e6c9 Makes Reagents Holder Process and Refactors NOREACT 2017-01-14 20:09:49 -05:00
Markolie f85e8fe551 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station.dm
#	icons/mob/screen_alert.dmi
 2017-01-11 23:11:29 +01:00
Crazy LemonandGitHub f1c3a7cd13 Merge pull request #6085 from Fox-McCloud/food-rework 
Food rework
 2017-01-10 12:11:17 -08:00
Crazy LemonandGitHub 3961aa3bcd Merge pull request #6074 from TullyBurnalot/Splatterdash 
Wand of Death Reliable Killing
 2017-01-10 00:27:23 -08:00
Markolie 0adc370d55 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/game/machinery/turrets.dm
 2017-01-09 22:00:31 +01:00
Mieszko Jędrzejczak 63d5b6a1b1 Adds that var to projectile hits printing 2017-01-08 22:15:58 +01:00
TullyBurnalot ecaf8678ab Wand of Death now deals Burn 2017-01-07 15:15:17 +00:00