cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 20:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,504 Commits 26 Branches 2 Tags
2c4cf6db3dde554e8bdc8fcd2aa9229e64647ba2
Commit Graph

3439 Commits

Author SHA1 Message Date
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
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
chafla
50a90d2767 Merge branch 'master' into ghost-rad-hud 2021-08-14 17:28:16 -07: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
S34NW
fa88d21ae4 Merge branch 'master' into solgov_ERT 2021-08-06 15:47:40 +01: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
Fox McCloud
cfde082a10 Merge pull request #15807 from hal9000PR/TG-carp-2-electric-boogaloo 
Ports TG sleeping carp, the second.
 2021-07-27 13:21:41 -04:00
AffectedArc07
fad93ed2e4 Revert "uh oh that guy is glowing green (#16435)" 
This reverts commit 076e807731.
 2021-07-27 12:54:33 +01:00
S34N
076e807731 uh oh that guy is glowing green (#16435) 2021-07-27 10:46:26 +01:00
variableundefined
7912fae83b Merge pull request #15354 from Qwertytoforty/My-turn-to-try 
Adds a heal point system to the rod of Asclupius
 2021-07-26 13:57:28 -04:00
Qwertytoforty
076cbba3c4 Aaaand extra brackets I forgot 2021-07-26 13:51:57 -04:00
Qwertytoforty
2eb5e26aba Final changes 2021-07-26 13:50:33 -04:00
Qwertytoforty
2523dc90bc Update code/datums/status_effects/buffs.dm 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-26 13:47:06 -04:00
variableundefined
b9aa1facce Merge pull request #15757 from warior4356/holy-chapel 
Makes the chapel holy once more.
 2021-07-25 08:37:18 -04:00
variableundefined
d91c8ba479 Merge pull request #15980 from AffectedArc07/toml-config 
[READY] Converts configs to use TOML + Configuration refactor
 2021-07-25 08:26:29 -04:00
datlo
daf2453d15 Add new lawsets and reorganise AI upload, the Third (#15743) 
* lawsets update

* Revert "lawsets update"

This reverts commit a68ddcb9ee.

* Lawsets update

* Remove quotes on ai module names

* fix map file

* Fix coding style

* Update hippocratic per review

Co-authored-by: Sean Williams <06sean@gmail.com>

* Update hippocratic per review

Co-authored-by: Sean Williams <06sean@gmail.com>

* Update hippocratic per review

Co-authored-by: Sean Williams <06sean@gmail.com>

* Fix merge conflict

* Update code/game/objects/items/weapons/AI_modules.dm

Co-authored-by: dearmochi <shenesis@gmail.com>

* Add a pilot seat to the ERT shuttle

* Revert "Add a pilot seat to the ERT shuttle"

This reverts commit 676bfa7d03.

* Update MetaStation.dmm

* deconflict

* Update code/game/objects/items/weapons/AI_modules.dm

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

Co-authored-by: Sean Williams <06sean@gmail.com>
Co-authored-by: dearmochi <shenesis@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-07-25 10:19:58 +01:00
SteelSlayer
fbda59a8f5 slime-iv (#15642) 2021-07-16 17:34:06 +01:00
warior4356
ba8052af3f Apply suggestions from code review 
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-07-15 18:44:23 -07:00
Farie82
64930de41c Makes all toy figurines tiny and refactors the code behind it (#15368) 
* Makes toy figures tiny and refactors the code behind it

* Apply suggestions from code review

Co-authored-by: dearmochi <shenesis@gmail.com>

* atom_say and capitalize names

* Web edit baby

* Merge conflict fixes

* Init instead of New

* prize_ball instead of mechball

* prize_ball should not be a figure. Revert but keep the Init change

Co-authored-by: joep van der velden <15887760+farie82@users.noreply.github.com>
Co-authored-by: dearmochi <shenesis@gmail.com>
 2021-07-15 13:59:26 +01:00
chafla
afc9b78a78 Revise radiation view to use a cached datum 
* Creates a new datum, radiation_cache, to store radiation levels per-tile
* Reworks radiation subsystem to initialize, expose radiation cache
* Makes radiation view reference tiles in range against rad cache
 2021-07-13 18:49:09 -07:00
dearmochi
712721fbc6 [READY] Reworks and Refactors Hallucinations (#15360) 
* Hallucination rework start

* Chaser/Attacker, Abduction

* Moderates

* Majors

* saber alter

* address SteelSlayer

* Fix admin logging and runtime

* put hallucination logging on ATKLOG_ALL
 2021-07-13 14:27:14 +01:00
AffectedArc07
035964ceb2 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-07-13 14:25:12 +01:00
Fox McCloud
40ab95bbaf Merge pull request #15778 from Sirryan2002/Despookify 
Prevents Ghosts from circumventing boo spell cooldown
 2021-07-13 00:34:47 -04:00
SabreML
3e8482cebb Makes machine frames show their circuit name (#15025) 
* Circuit Names Refactor

* Some review stuff

* now with less runtimes

* Machine Boards and Computer Boards

* Only a little late

* YouTool fix

* Resupply crate too

* Supplycomp board

I'll do the other stuff tomorrow

* Computer Frame Refactor

Plus also removing the HONKputer to avoid a conflict.

* Don't need this diff anymore
 2021-07-10 19:43:40 +01:00
S34NW
59938c00e5 Merge branch 'master' into solgov_ERT 2021-07-10 15:43:33 +01:00
S34NW
b8ff112b43 updates 2021-07-10 15:41:42 +01:00
AffectedArc07
9ddf4ceb97 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-07-09 11:42:23 +01:00
dearmochi
52e86bd0ed Early stage viruses no longer show on medical HUD (#16307) 2021-07-09 11:39:37 +01:00
SabreML
908c4f0dd1 Jobban adjustments (#16319) 
* Borer ban

* Terror Spider jobban category

* Defines
 2021-07-09 11:39:01 +01:00
warior4356
7a7364fcfd Adds critical as a state to the crew monitor (#16313) 
* Adds critical as a state to the crew monitor

* TGUI rebuild
 2021-07-09 11:21:04 +01:00
Fox McCloud
ddea09dce2 Merge pull request #16082 from AffectedArc07/gc-improvements 
GC ref finding improvements
 2021-07-08 19:25:23 -04:00
Kepplerx
1d04a9ec74 AI Detector can now only detect AI, not Abductors, Xenobio consoles or Shuttles (#15535) 
* Update navigation_computer.dm

* V7

* Update navigation_computer.dm

* All instances

* Added explainers

Seems this is done some places, seems nice and easier to understand with em

* Updated name

* Change Variable name

Changed as per advise of Fox
 2021-07-08 23:18:15 +01:00
moxian
e835205f50 Alphabetize items in debug equipment selection menu. (#14641) 
* Alphabetize items in debug equipment selection menu.

* Rename some outfits to group them together in the selection menu.

* Farie's suggestions

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-07-08 23:10:39 +01:00