cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 19:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,753 Commits 26 Branches 2 Tags
890e7e5ce5f91ca0878ebf8a01a67978a172ebfa
Commit Graph

3468 Commits

Author SHA1 Message Date
AffectedArc07
9c14b6b732 Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support 2021-09-20 22:11:50 +01:00
variableundefined
5339cdf212 Merge pull request #16659 from Fox-McCloud/the-end-of-lethal-shot 
Nerfs Shotguns
 2021-09-19 11:25:02 -05:00
Stokes52
8f1e2344fa Refactor modulator and horse mask to use the new speech change proc 2021-09-19 07:42:58 -07:00
Stokes52
9160dfa3fe Implement fixes to modulator mask from code review 2021-09-19 07:42:54 -07:00
Stokes52
6c3675ad0c Add voice modulator mask for crafting and traitor uplink 2021-09-19 07:42:21 -07:00
variableundefined
522390c0b9 Merge pull request #15675 from Fox-McCloud/his-grace-ascended 
Implements Better His Grace
 2021-09-18 15:26:30 -05:00
variableundefined
5ca3a34d3b Merge pull request #16720 from Qwertytoforty/grabbing-your-attention 
Makes revive, biodegrade, and freedom break grabs
 2021-09-17 22:12:08 -05:00
variableundefined
fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines 
Adds defines for damage flags
 2021-09-17 22:10:20 -05:00
variableundefined
454ce66eea Merge pull request #16679 from SabreML/progress-bar-HUD-layer 
Makes progress bars render above the game HUD
 2021-09-17 21:15:16 -05:00
Qwertytoforty
4a4522641f Removes uneeded procs, updates ability desc 2021-09-16 13:17:26 -04:00
variableundefined
2e98227daa Merge pull request #16489 from E-MonaRhg/departmental-clothing-vendors 
Departmental clothing vendors (vendors only, no map edits)
 2021-09-11 14:11:03 -05:00
variableundefined
a118dd1308 Merge pull request #16491 from shmabuu/Clown/Mime-Mech-Fix 
HONK Mech and Reticence Mech Fix
 2021-09-11 13:45:09 -05:00
E-MonaRhg
f4e58a0961 Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-09-11 20:26:54 +02:00
SabreML
eacc7a52de do_after() progress bar HUD layering 2021-09-11 01:36:47 +01:00
Fox McCloud
a081051133 Nerfs Shotguns 2021-09-08 12:17:08 -04:00
AffectedArc07
b0e9db64bd Revert "Merge pull request #16520 from SabreML/fix-bundle-4" 
This reverts commit 9a62622fbc, reversing
changes made to 841ad0f1fd.
 2021-09-07 16:16:40 +01:00
variableundefined
9a62622fbc Merge pull request #16520 from SabreML/fix-bundle-4 
Fix bundle #4
 2021-09-06 22:29:10 -05:00
variableundefined
841ad0f1fd Merge pull request #16609 from SabreML/GC-fixes-1 
GC fix bundle #1
 2021-09-06 22:15:44 -05:00
E-MonaRhg
a99fc879df Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-09-06 19:32:39 +02:00
Fox McCloud
23164e354b conflicts 2021-09-06 04:06:47 -04:00
SabreML
c122e67693 Merge remote-tracking branch 'upstream/master' into fix-bundle-4 2021-09-02 17:48:42 +01:00
variableundefined
936fbf3194 Merge pull request #16601 from Qwertytoforty/wii-sports-annoucer 
Adds antimatter sniper rounds, buffs bleeding rounds, nerfs base sniper rounds
 2021-09-01 19:46:04 -05:00
variableundefined
188496c678 Merge pull request #16595 from SabreML/clothing-migration 
[IDB IGNORE] Clothing .dmi file organisation
 2021-09-01 19:44:59 -05:00
variableundefined
abe072f936 Merge pull request #16596 from S34NW/right-click-rearrange 
Makes admin verbs easier to see on the context menu
 2021-09-01 19:43:56 -05:00
SabreML
f66bcbba38 Material Container 2021-08-28 21:04:50 +01:00
Qwertytoforty
137b11924e An to A 2021-08-28 15:01:32 -04:00
Qwertytoforty
e9e7522076 Adds antimatter sniper rounds, changes variables around 2021-08-26 17:05:21 -04:00
TheYeetster1
422e033d59 Adds 3 new names when a hardhat is put on a corgi (#16553) 
* Hardhats

* Fixes relative path

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-08-25 15:57:16 +01:00
S34N
7188e92123 wall jaunting begone (#16591) 2021-08-25 15:37:30 +01:00
Farie82
4273a7db49 Butterflies created from severe anxiety decompose (#16594) 
* Butterflies created from severe anxiety decompose

* Remove useless return

* Update code/datums/diseases/anxiety.dm

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-08-25 15:30:48 +01:00
S34NW
603ad19634 Groups and makes admin verbs easier to read 2021-08-24 22:29:07 +01:00
SabreML
6648d3131f Clothing Organisation V1 2021-08-24 18:37:48 +01:00
S34N
334bab4af1 Fixes runtimes in spell can_cast() checks. (#16592) 
* fixes null locs like disposals causing runtimes

* Update code/datums/spell.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-08-24 14:24:09 +01:00
Mieszko Jędrzejczak
00dedfe6a9 Swiftly sanction Sabre's systematic suggestions 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-08-21 12:57:24 +02:00
Mieszko Jedrzejczak
1465a7de14 magic damage flag 2021-08-20 22:18:26 +02:00
Mieszko Jedrzejczak
559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
AffectedArc07
6381e692dc FUCKING VALUES 2021-08-17 15:14:25 +01:00
AffectedArc07
e19a83f9be SSinstancing (I need to test this with 2 machines) 2021-08-17 14:05:46 +01:00
E-MonaRhg
566b246a24 Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-08-16 21:32:35 +02:00
chafla
50a90d2767 Merge branch 'master' into ghost-rad-hud 2021-08-14 17:28:16 -07:00
E-MonaRhg
c895e47ccb Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-08-13 19:26:44 +02:00
SabreML
301ee25b23 Progress bar layering over the HUD 2021-08-11 15:52:22 +01:00
Matt
68b4faf763 Merge branch 'master' into ghost-rad-hud 2021-08-10 11:14:35 -07:00
shmabuu
27eed79e69 Clown/Mime Mech Fix 2021-08-06 22:08:43 -07:00
S34NW
fa88d21ae4 Merge branch 'master' into solgov_ERT 2021-08-06 15:47:40 +01:00
E-MonaRhg
ecd50aaf71 Suggested stuff + security bomber jacket and renamed hard hats 2021-08-06 14:50:11 +02:00
E-MonaRhg
c652bbfa10 Initial departmental clothing vendors commit 2021-08-05 22:01:05 +02:00
SabreML
02fe0876f5 Fix bundle #3 (#16411) 
* Explosive implant

* Package wrapper

* Venus human trap sprites

* Vine damage

* Wisp vision

* Display case

* Storage viewing

* Ghost poll nullspacing

* Inflatable barrier piercing

* Pneumatic cannon

* Cow grammar

* Centcom jaunting

* Consistency

Not actually a lazy list, as far as I can tell

* Review 1

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Review 2

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* length()

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-08-05 11:04:27 +01:00
AffectedArc07
e46f67810a Cleans up the TODOs I left all over the codebase (#16443) 
* Removes command_name() proc

* Removes GLOB.teleportlocs + GLOB.ghostteleportlocs

* Clean up IPIntel

* Tweaks karma logging

* Tweaks time
 2021-07-28 13:45:18 -04:00
dearmochi
c95f566cd1 Custom emotes display on runechat (#16355) 
* Custom emotes display on runechat

* document symbol arg

* Update code/__DEFINES/misc.dm
 2021-07-28 10:06:43 +01:00