cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 23:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,098 Commits 26 Branches 2 Tags
bdf50ea89400a5d080df567b99025b399eaeee5a
Commit Graph

124 Commits

Author SHA1 Message Date
AzuleUtama
0f3133eb25 Fixes certain Nuke Ops bundles using the wrong duffelbag sprite (#17717) 
* sprites updated

* removes redundant icon/item states
 2022-05-03 04:24:16 +01:00
datlo
d94210031b Refactor C4, subtypes, and airlock ex_act (#16995) 
* Refactor C4 and Airlock ex_act

* update uplink desc

* Replace ismob by carbon, clarify comment

* remove unnecessary ismob check

* replace destroy by qdel, fix comment

* auto doc comments, add else condition

* Add comment to shaped c4

* Shortens shaped boom proc, make airlocks more resistant against light ex
 2021-11-05 10:12:09 +01:00
variableundefined
fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines 
Adds defines for damage flags
 2021-09-17 22:10:20 -05:00
SabreML
6648d3131f Clothing Organisation V1 2021-08-24 18:37:48 +01:00
Mieszko Jedrzejczak
559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
S34N
7c6e19850a Merge branch 'master' into solgov_ERT 2021-06-22 10:37:32 +01:00
hal9000PR
fc3185dcb6 fix (#16209) 2021-06-19 23:07:50 +01:00
S34NW
ba45742fe9 loadout update, armour tweaks 2021-06-13 16:56:57 +01:00
SabreML
3ae6ef1fc2 Initialized Storage Items (#15057) 
* Refactor V1

* And this too

Three commits already

* Review stuff

* hecking invisible runtimes

* Cleanup and Documentation

This part is NOT intended to be a refactor.
I just figured why not go through everything since I'm already messing with it.

* Hopefully got all of the . = ..()

Also fixed a massive bug that I somehow didn't notice.

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

* for() loops

Pretty sure I got everything.
Cutoff point is 4 items.

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-02-28 21:45:24 +00: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
danni boi
2f3d5bf868 removes magic wall safe exploit (#14890) 
* should stop the exploit

* logic was wrong, my bad

Co-authored-by: danni-boy <32673848+danni-boy@users.noreply.github.com>
 2020-12-16 15:04:06 -05:00
AffectedArc07
90fd9a8fb8 Removes all relative heresy (#13969) 
Removes all relative heresy
 2020-09-16 12:52:20 -04:00
EMPlight
ce2ec83e01 Adds Extended drum mag and bundle for nuke ops. 2020-06-12 22:43:55 -07:00
ZomgPonies
defbf5b6df Lizard skin handbag (#13477) 
* lizard handbag crafting recipe

* lizard handbag item

* lizard handbag sprites

* Fix styling of skin recipes
 2020-05-24 14:07:41 -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
variableundefined
d8a934381c Merge pull request #12854 from Darkmight9/ERT_and_Dsquad_bag_space 
Increases bag space of ERTs and death squads
 2020-03-08 03:34:23 -04:00
Aquilar
c9bc00f654 grammar errors 2020-03-04 14:52:40 +08:00
Aquilar
b43f41ee47 making sure Rapaskoti's new icons work, and coding what they wanted to do. 
Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>
 2020-03-04 14:27:41 +08:00
Fox McCloud
8f297aa4d0 Merge pull request #12683 from MarsM0nd/order_conscription_kit 
Brings orderable conscription kit in line.
 2020-02-24 19:48:46 -05:00
joep van der velden
5ca4ea4025 Removed unneeded New procs 2020-02-07 20:38:09 +01:00
joep van der velden
fd913498bf Make every obj/.../New() call it's parents 2020-01-29 10:43:32 +01:00
Darkmight9
c5ee1c68dd Increases bag space of ERTs and death squads 2019-12-27 18:59:07 -05:00
Mars
f2f7ec956a Orderable conscription kit only without ID 2019-10-31 15:43:35 +01:00
Fox McCloud
2224229fad Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-30 14:18:33 -04:00
variableundefined
e02a76aa73 Fixes too many items in the conscription kit #12436 2019-09-29 19:41:07 -07:00
Fox McCloud
9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage 
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
 2019-09-28 00:16:11 -04:00
Mars
8b87bd529c Slight refactor of conscription kit 2019-09-27 17:44:06 +02:00
farie82
0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud
aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
Fox McCloud
788f1926fb though-our-bodies-be-ravaged 2019-09-15 19:49:52 -04:00
Fox McCloud
af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud
1bfb442d40 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-14 21:15:31 -04:00
AzuleUtama
c6d846b6b6 Nuclear Operative Item Tweaks 2019-09-11 21:25:44 +01:00
Fox McCloud
f998cb74ad then-we-shall-reforge-the-armor-from-what-remains 2019-09-10 07:03:05 -04:00
KasparoVy
ca495b2b9b Adds Sprites for Some Armalis+Vox Gear & Species-fitting Inhand Icons, etc. 
Adds sprites for all Vox & Armalis earwear
Adds sprites for Armalis default backpack, nitrogen tank (non-'emergency' back & belt) all breathmask variations

Fixes an issue where Vox Armalis wouldn't be rendered with the proper in-hand icons for their massive noise cannons.
Fixes an issue where you couldn't species-fit earwear.
Fixes an issue where Vox Armalis couldn't wear the 'Vox' breath mask.
 2019-08-23 22:14:47 -04:00
Ionward
e347ae8dfe a little more than a touchup, includes: grey fit backpacks + uniforms and fixes associated, drask glasses and masks, and a version of the god eyes for drask grey and vox 2019-08-19 18:34:37 -07:00
variableundefined
9097eb0e1d Merge pull request #11741 from AzuleUtama/chameleonGlasses 
Traitor thermals and security HUD now use updated chameleon code, Slight buff to the thermals
 2019-08-13 12:06:39 +08:00
AzuleUtama
9500df95d3 Traitor thermals and security HUD now use chameleon code 2019-06-22 14:06:07 +01:00
Improvedname
24c2b0fd4f j 2019-06-10 19:53:03 +02:00
Mark van Alphen
b65fbb907e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/obj/vending.dmi
#	paradise.dme
 2019-05-30 19:35:52 +02:00
Mark van Alphen
ec70c2512d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into bundles 
# Conflicts:
#	code/modules/clothing/masks/breath.dm
#	code/modules/clothing/masks/gasmask.dm
 2019-05-23 18:56:25 +02:00
Mark van Alphen
2c5e216e82 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	paradise.dme
 2019-05-17 17:37:18 +02:00
Arkatos1
b2e7149f1d Adds new inhand sprites 2019-05-06 16:08:38 +02:00
Mark van Alphen
90f71f164a Remove unused species_fit and move chameleon file 2019-05-05 20:37:53 +02:00
Mark van Alphen
d98eb14a39 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
#	code/modules/shuttle/shuttle.dm
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-05-04 03:16:38 +02:00
Mark van Alphen
e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
Mark van Alphen
09da967bd1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	_maps/map_files/RandomZLevels/moonoutpost19.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm
 2019-04-18 03:15:52 +02:00
Mark van Alphen
f63b587f54 Nuke ops updates 2019-04-07 21:57:22 +02:00
CornMyCob
9f5b3fc796 updates 2019-04-02 20:26:23 +01:00
AzuleUtama
29aa1ccef7 Removed MMI from surgery bag, made it Roboticist only 2019-03-18 20:22:38 +00:00