cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-23 08:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,148 Commits 26 Branches 2 Tags
2a3e27e14d9f5f802d901b57895e25cb146e9aff
Commit Graph

364 Commits

Author SHA1 Message Date
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
variableundefined
c2bf480622 Merge pull request #9631 from Birdtalon/ERT-changes 
Gamma ERT Changes
 2018-10-09 08:58:15 +08:00
Crazy Lemon
916e0d9a72 Merge pull request #9415 from variableundefined/SpeshulGunlog 
Minor attack log overhaul
 2018-10-08 01:16:21 -07:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Birdtalon
5275b5f56f further gun tweaks/changes, adds sprite 2018-08-31 19:12:39 +01:00
Birdtalon
49e47d00bb adds multi lens immolation gun 2018-08-29 18:57:35 +01:00
variableundefined
20698305e0 Minor attack log overhaul 2018-08-25 17:19:01 +08:00
shazbot194
939cefcca0 Updates Enforcers 2018-08-22 18:48:01 -08:00
Fox McCloud
7f2030415f staff of change fix 2018-08-02 13:43:44 -04:00
Fox McCloud
7440dad57e further conversion 2018-07-18 01:13:24 -04:00
Fox McCloud
aae5405d03 AGHHHHHHHHHHHHHHHHHHH WHATTT 2018-07-17 04:58:36 -04:00
Tayyyyyyy
919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Tayyyyyyy
aa9d658847 Them 2018-05-25 18:34:28 -07:00
tigercat2000
858d83505b Merge pull request #9067 from Birdtalon/lasertag 
Laser tag projectiles make tap sound when striking
 2018-05-25 18:03:06 -07:00
Birdtalon
d46d84237f laser tag guns now make tap.ogg when striking 2018-05-23 21:43:34 +01:00
Ansari
827503b0a4 EMP now provide coordinates and allow you to jump to it. Most EMP instance except for the Experimentor and the Singularity are now logged. 2018-05-23 18:33:12 +08:00
Fox McCloud
c5cbb0414a Fixes Basilisk Projectiles 2018-05-14 19:27:43 -04:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
tigercat2000
2364b0332b Convert a bunch of name/(ckey) to key_name + ISO-8601 timestamps 2018-04-19 15:08:59 -08:00
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
tigercat2000
9692d1357c Merge pull request #8374 from Fox-McCloud/shotguns-OP 
Nerfs Shotgun Pellets
 2017-11-30 11:08:24 -08:00
tigercat2000
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 Lemon
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