cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-24 08:22:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,953 Commits 29 Branches 2 Tags
2c2dc377fe6d682fe1a2bcda4d0887b153bf8ecc
Commit Graph

38 Commits

Author SHA1 Message Date
warriorstar-orion
0667f20681 move all EOL comments on typepath names to dmdoc (#23928) 
* move all EOL comments on typepath names to dmdoc

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-03-01 20:05:49 +00:00
GDN
82b863cefd Converts over the missing TGUI input lists (#23859) 
* Converts over the missing TGUI input lists

* last fixes

* num revert
 2024-02-14 21:17:29 +00:00
DGamerL
db578cdc6f Makes food not a subtype of reagent holders (#23379) 
* I am suffering

* Alright this should be all now

* Fixes CI

* I hate the online merge resolver.

* This got lost in the merge master

* Updatepaths fixed + new added

* Contra review

* Fixes desserts

* Oops

* This should fix it

* Maybe?

* Attempt 3

* Missed conflict

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/pizza.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Fixes grinders

* Adds comment

* Warrior review

* Warrior + Sirryan review

* Update code/modules/food_and_drinks/food_base.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-01-21 19:00:02 +00:00
DGamerL
004d7d10b7 Refactors is_hot and fixes some issues from the beaker lighting PR (#22964) 
* Idk what I'm doing

* The is_hot refactor

* Fixes that I forgot to push before making the PR

* Update code/game/objects/items.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Contra review

* TODO: Find out why this isn't working

* Removes the signal stuff for now, this works

* Fixes it all

* Add new signal

* Update code/_onclick/item_attack.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Contra reivew

* Ayyy it works

* Merge master

* Forgot this one

* Update code/game/machinery/doors/airlock_types.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/objects/structures/mineral_doors.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/turfs/simulated/floor/mineral_floors.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/turfs/simulated/walls_mineral.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-12-11 16:53:51 +00:00
S34N
547ce531a7 Cyberiad Bridge remap (#23015) 
* initial

* final changes

* edits

* PDA, errors. etc.

* further tweaks

* do a flip

* glass APC

* shuffle continues

* move AI upload to sci, restore old shop and explorer room

* pipes!

* statue fix

* warrior fixes

* Update code/game/objects/structures/statues.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* denth request, merge conflict fixes

* area shuffle

* wall furniture my beloathed

* fixes teleporter, fixes ventless AI upload

* minor fixes

* more tweaks

* Update code/game/area/ss13_areas/engineering_areas.dm

* more fixes

* grav gen shuffle

* messaging server APC move

* move AI upload again, fixes

* further tweaks

* minor tweaks

* minor fixes

* nukes supply sop

* git-gor fixes

* disposal fixes

* cable fix

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-11-20 15:49:36 -05:00
warriorstar-orion
066bd06e8d Whitespace cleanup part 3. (#19897) 
* Whitespace cleanup part 3.

* clean up mecha a lot, other review fixes
 2022-12-27 11:00:39 -05:00
Henri215
74a5925def A museum's finest: Statues tweaks (#19680) 
* tweaks and adds to statues

* bust removed
 2022-11-26 16:02:52 -05:00
KalevTait
8dcf49855b Code Readability - Structures (#18273) 
* structures

* requested changes
 2022-07-10 14:00:25 +01:00
hal9000PR
6842d374c8 how did this make any sense? (#15904) 2021-04-18 11:38:39 +01:00
Fox McCloud
de795c4e31 Radiation Refactor (#15331) 
* First Commit

* visible radiation and engine goggles

* correction

* t-ray fix

* further adjustments and fixups

* gieger addition and cleaning fixup

* yet more fixes

* styling fixes

* fixes

* human glowing fix

* do the merge conflict avoidance dance

* Update supermatter.dm

* supermatter rads

* mapping in

* radiation doors

* yeah yeah line endings

* clean up

* styling issues

* showers
 2021-01-24 22:03:13 +00:00
Pidgey
3095a3468e Makes Chicken Man statues in Mr. Chang's into real statues (#13721) 
* I think this is ok?

* Chicken Man and Kidan statues are now real statues that can be moved and disassembled (disassembly causes them to vanish without dropping materials as there are no bronze or obsidian stacks). Moved their sprites from decorations to statues for consistency.

* Oops! Metastation too.

* Finally got everything sorted out. Phew!

* The OXENbot on the derelict station is no longer a renamed chicken man statue. It can also be unanchored and sliced up for metal should you be inclined to do so.

* What even is this? Delete this.

* Coding standards

* Removed density variables from the changed statues.

* Fixes conflicts
 2020-07-13 14:23:56 -04:00
AffectedArc07
04ba5c1cc9 File standardisation (#13131) 
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
 2020-03-17 18:08:51 -04:00
AffectedArc07
8671439f11 Merge branch 'master' into var/const-to-define 2020-02-22 16:30:01 +00:00
Citinited
fddff1049b [Testmerge ready] Ports tool behaviours; refactors all tools; adds functionality for self-filling reagent containers (#11700) 
* Adds support for self-filling reagent containers

* Sets tool_behaviour on the default set of tools

* Fixing merge conflicts

* Refactors welder to use tool behaviour

* The refactor: part I

* The refactor: part II

* Tool Refactor Part III: Revenge of the Maint

* Tool Refactor Part IV: A New Hope

* Tool Refactor Part V: The Oldcoder Strikes Back

* Tool Refactor Part VI: Return of the Coder

* VII

* Holy shit, it compiles?!

* Nannek I completed your TODO, you owe me ice cream

* Tool helpers; telepad is compliant

* Bugtest, Round 1: Fight

Fuck refactoring disposals

* Buggfixing, Round 2: Electric Boogaloo

* Personal crafting uses tool behaviours now

* Construction datums use new tool behaviours; better way of handling fueltank refuelling; more bugfixing

* multitool_check_buffer change; removes some useless things in tool_helpers

* proc name change

* TRUE/FALSE changes

* Bugfixing, Round 3: A Good Day To Bugfix Hard

Fixes multiple issues raised by the testmerge

* Minor style changes
 2020-02-15 13:31:08 -07:00
AffectedArc07
c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
Fox McCloud
67dc33ac3f for-the-strength-from-which-he-gives-is-unerring 2019-10-05 02:08:11 -04:00
Fox McCloud
20c4cf0a08 for-if-I-stand-I-stand-by-his-will-alone 2019-10-03 19:52:03 -04:00
Fox McCloud
a469d0fcf2 for-God-has-redeemed-us-all 2019-09-30 16:49:15 -04:00
Fox McCloud
aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
Dovixx
1e388140e7 Change it 2019-03-26 18:59:53 +02:00
Fox McCloud
277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
Citinited
eff4107049 Snowman drops stuff on destroy now 2018-12-30 03:00:33 +00:00
Citinited
48f37473d7 proper path for built snowmen 2018-12-30 02:25:34 +00:00
Citinited
ccb61518ae You can now build snowmen at Christmastime; removes commented out code 2018-12-30 02:15:05 +00:00
KasparoVy
715286421a Amends Plasma Statue Logging & Projectile Ignite Requirements 
Can't ignite a statue with a disabler anymore.

Brings the logging on par with that of welding tanks.
 2018-11-18 20:47:25 -05:00
Mars
d9b60a7bfb Fix merge conflict 2018-10-09 09:41:37 +02:00
TDSSS
0ad8a2b2de Makes weapons that deal no damage unable to ignite plasma statues 2018-09-30 16:44:00 +02:00
Mars
b5b09b435c No hard-coded format in the macros anymore 2018-08-16 11:51:52 +02:00
Mars
e8d92b3ced More flexible macro 2018-08-16 11:37:03 +02:00
Mars
4d3c3b29e4 Quick Regex replace action 
Used Regex to replace all hrefs with \ref and the same displayed text
with the corresponding UID macros
 2018-08-15 23:57:46 +02:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Ty-Omaha
9cb754ba57 gets rid of an unneeded ( 2017-11-25 12:17:36 -05:00
Ty-Omaha
e96ad102f9 investigate log stuff 2017-11-25 12:03:58 -05:00
Markolie
5c20a29b1d Fix statue welding, fix firedoor message spam, fix slaughter candidate pick 2017-03-11 18:25:23 +01:00
Markolie
3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
uraniummeltdown
d0d2c63f30 remove trailing returns, alter checks, setdir, light_range 2017-02-27 15:03:28 +04:00
uraniummeltdown
4c6472aa49 rotation for mime statue 2017-02-19 22:39:23 +04:00
uraniummeltdown
7628586ee6 adds mineral statues from TG, added statue recipes for minerals, breakdown sandstone->sand 2017-02-19 21:48:13 +04:00