cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-08 00:21:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,125 Commits 26 Branches 2 Tags
ea004bddcf2e6059587d0b8a95df19087d1c7a77
Commit Graph

3681 Commits

Author SHA1 Message Date
ZEUS\samcr
70c5d4b987 IPC First Aid Kit No Longer Has Oil 2020-10-09 14:35:44 -04:00
AffectedArc07
3ee7d2e89e Merge pull request #14525 from FlattestGuitar/oc-donut-steel 
fancier donut boxes
 2020-10-08 17:11:42 +01:00
Mieszko Jędrzejczak
2d83dbdde0 / 
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2020-10-06 14:00:36 +02:00
FlattestGuitar
153147bcba donut box improvements 2020-10-03 20:34:33 +02:00
SabreML
3f8ee9b375 Removes 'bnotice' span class 2020-10-02 16:17:26 +01:00
Kyep
aa300ea6b8 Fixes #13702 - wizard scroll produces zlevel error 2020-09-26 20:24:04 -07:00
Kugamo
2e8c9775b6 Inhand Trashbag Sprites (#14418) 
* sprotes

* small alteration to sprites, and realtime updates to inhand icon
 2020-09-25 16:10:16 -04:00
Kyep
9a3ecd6383 Fix runtime when activating internals while smoking 2020-09-24 14:00:39 -07:00
SteelSlayer
01da8413de Adds the proximity monitor component. Performance improvement for turf/Entered (#14196) 
* proximity monitor

* Update code/__HELPERS/unsorted.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* farie review tweaks

* actually I need this

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2020-09-20 13:31:16 -04:00
farie82
81682dc626 Adds muzzle flashes for guns depending on the ammo (#13322) 
* Muzzle flashes added for guns

* Use an muzzle flash effect now.

* Unused var

* sillenced guns have a lower alpha muzzleflash effect
 2020-09-20 12:41:45 -04:00
Dovixx
b35a9f3af3 Add the checks 2020-09-19 23:16:59 +03:00
AffectedArc07
ce2f0d401d Swings the axe on modular consoles (#14355) 
* Swings the axe on modular consoles

* Experience will not save you in these parts
 2020-09-19 09:36:56 -04:00
AffectedArc07
c5fece9cfe Merge pull request #14383 from TDSSS/donk-fix 
The return of the donk
 2020-09-19 14:06:29 +01:00
TDSSS
6e7ca4000f fix donks 2020-09-19 14:51:10 +02:00
TDSSS
33f600d0d3 Spray logging improvement (#14331) 
* better logging

* now with target
 2020-09-18 19:41:46 -04:00
dearmochi
101ad5b617 Ports security webbing from /tg/ (#14354) 
* Ports security webbing from /tg/

* Can only be purchased from cargo (15 pts for 3)
 2020-09-18 18:53:42 -04:00
farie82
229cf3e344 Martial arts rework/refactor. And you can't prepare combos now. Arts tied to the mind (#13341) 
* first commit. combos, CQC started

* CQC working

* All transfered to new system

* The actual bug fix

* add time in between combos

* time between combos limit and minor explaination tweak

* Krav maga fixes, time change. Minor text changes

* Move martial_art to mind

* Merge mistake fixed

* Steels review changes
 2020-09-18 11:07:19 -04:00
TDSSS
328b7fa8d8 ERT idiotproofing and minor tweaks (#13834) 
* makes ert more robust

* renamed and tweaked

* idiot proofing of ert

* I cannot into git, oops

* removed the anti-stun from code red erts again

* removed implied src
 2020-09-16 16:38:25 -04:00
AzuleUtama
8cf7051cb9 Energized fire axe rework (#13907) 
* Energized axe reworked and now subtype of regular axe
 2020-09-16 15:36:39 -04:00
AffectedArc07
c5597b9372 Merge pull request #14291 from Kyep/tgui_id_computer 
[TGUI] ID Computer
 2020-09-16 20:10:42 +01:00
AffectedArc07
90fd9a8fb8 Removes all relative heresy (#13969) 
Removes all relative heresy
 2020-09-16 12:52:20 -04:00
SteelSlayer
dab29cc668 Merge remote-tracking branch 'upstream/master' into spawn-removal 2020-09-16 09:38:20 -05:00
Kyep
7b78232276 Reworks Baseball Bat (#14186) 
* Adjusts baseball bat

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2020-09-16 10:16:21 -04:00
Kyep
eb464ebd24 fixes merge conflict 2020-09-16 06:54:30 -07:00
joep van der velden
0bfe9d994e Merge remote-tracking branch 'upstream/master' into bombing-logging-and-co 2020-09-16 15:26:19 +02:00
variableundefined
a6d6d0591d Merge pull request #13489 from AzuleUtama/uplinkBundleTweaks 
Improves Hacker and Payday uplink bundles
 2020-09-16 09:02:54 -04:00
Kyep
07b4ff1354 merge conflict fix 2020-09-15 17:04:39 -07:00
variableundefined
db06596ffa Merge pull request #14283 from SabreML/Fire-Lighting 
Makes cigarettes catch fire if their holder is also on fire
 2020-09-15 19:41:02 -04:00
Kyep
00b458be3e fixes merge conflict 2020-09-15 15:34:50 -07:00
AffectedArc07
e12701c453 Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14022 2020-09-15 16:23:11 +01:00
Kyep
4e44253af3 fixes merge conflict, updates to master 2020-09-15 00:31:56 -07:00
variableundefined
3a3ff1400a Merge pull request #13447 from EMPlight/BulldogXLmag 
Adds Bulldog extended drum mags and bundle for nuke ops.
 2020-09-14 16:45:04 -04:00
variableundefined
f5b7554c1a Merge pull request #12851 from SteelSlayer/internals-auto-push-up 
Activating internals automatically pushes breath masks into place
 2020-09-14 16:02:45 -04:00
Kyep
933a2f4e34 lastlog, dept_demote, refactor 2020-09-12 23:42:58 -07:00
AffectedArc07
706dc6e3c6 Merge pull request #14233 from RedWolfie/chameleon 
chameleon flag fix
 2020-09-12 23:45:09 +01:00
SabreML
3aea152a93 Fixes 
Changed 'Your' to 'The', since it's a 'visible_message'.
Also removed implied src
 2020-09-12 16:43:39 +01:00
SabreML
af2ea50764 Cigarettes catch fire 2020-09-12 15:38:57 +01:00
joep van der velden
062f275b6c On tray not cyb tray 2020-09-12 10:34:31 +02:00
joep van der velden
5244b49e4e Revert the . = ..() 2020-09-12 10:28:01 +02:00
joep van der velden
33f1353126 cyborg trays drop stuff upon death. NAD disallowed 2020-09-12 10:24:12 +02:00
AffectedArc07
7ee337b9e6 Merge pull request #14259 from RedWolfie/blind-weld 
Fixes some messages
 2020-09-08 12:01:23 +01:00
Certhic
77258b9b0c fixes garrote typo 2020-09-07 20:59:36 +02:00
Certhic
070904dd7b smoke bomb runtime fix 2020-09-06 12:16:05 +02:00
AffectedArc07
75bbf7a6d5 Merge pull request #14088 from kugamo/Inhand-sprites-for-cigarette-packets 
Inhand sprites for cigarette packets
 2020-09-02 11:04:41 +01:00
Certhic
90ac9874b2 fixed orange crayons not making cables orange 2020-09-01 16:23:53 +02:00
AffectedArc07
ebba3a322b Merge pull request #13703 from Fox-McCloud/tg-flying-floating-float-refactor 
TG Flying+Floating Refactor
 2020-08-27 20:08:35 +01:00
SteelSlayer
6e641db3fe Merge remote-tracking branch 'upstream/master' into internals-auto-push-up 2020-08-25 16:39:08 -05:00
AffectedArc07
3fb3353bc8 Merge pull request #14068 from ExusA/Spray-Fix 
Hydroponics Spray Fix
 2020-08-19 11:18:33 +01:00
ExusA
c1756fe7e3 Update code/game/objects/items/weapons/storage/belt.dm 
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2020-08-19 18:09:13 +08:00
AffectedArc07
ce0eb1fbdc Merge pull request #14003 from dearmochi/fix-lipsticks-draw-order 
Fix colored lips drawing over masks and random lipstick colouring
 2020-08-19 10:46:04 +01:00