Commit Graph

359 Commits

Author SHA1 Message Date
denghis1
846b479686 bugfix, scopes lawyers_badge/attack_self properly
Scopes the attack_self of the lawyers_badge to that accessory, instead of setting it on every single accessory, thus preventing everyone from being able to pretend that they are an attorney
2020-07-02 22:48:52 +02:00
Fox McCloud
93db61665d Speech bubble refactor and Features (#13598)
* Speech Bubble Update and Refactor

* OBJECTION

* magistrate too

* args

* clean up and plug in atom say

* better
2020-06-28 14:23:32 -06:00
mochi
bc5bab7bc1 Add type checks in case of Initialize() weirdness 2020-06-24 11:22:35 +02:00
mochi
096bc87dd3 Actually plug armor procs to armor modification code 2020-06-23 09:41:48 +02:00
Fox McCloud
798cf7a8be Removes Fat Sprites (#13430)
* Removes Fat Sprites

* fat vs chubby

* edge case
2020-05-23 03:10:39 -06:00
datlo
9fcb19126e Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into wizloadouts 2020-05-18 09:22:27 +02:00
Fox McCloud
d8134fd328 Refactor and Fixes EMP's (#13420) 2020-05-14 20:39:44 -04:00
datlo
d0c0e4a207 trailing newlines 2020-05-02 11:00:50 +02:00
datlo
7b2c9d9564 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into wizloadouts 2020-05-02 10:25:05 +02:00
nl-208
d66e7471d3 fix spelling/grammar in envirosuit files, correct one last error in envhelmet files 2020-04-11 03:11:22 -04:00
datlo
be91b68214 Add mime robe, plasmaman wiz outfit 2020-03-26 14:20:04 +01:00
AffectedArc07
210f8badf4 Makes all global variables handled by the GLOB controller (#13152)
* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
2020-03-20 21:56:37 -06: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
a1fa46f5a8 Merge branch 'master' into var/const-to-define 2020-03-03 22:44:07 +00:00
variableundefined
611163d051 Merge pull request #12706 from Ty-Omaha/Uniforms
Updates uniforms for naval officers
2020-03-01 23:15:46 -05:00
AffectedArc07
c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
Ty-Omaha
99204689d5 Removes armor 2019-12-19 14:01:02 -05:00
Ty-Omaha
7e26d120bc grammar again sorry 2019-11-06 08:00:19 -05:00
Ty-Omaha
865cd32143 removes new() blueshield 2019-11-06 07:58:50 -05:00
Ty-Omaha
123636dad4 makes it compile 2019-11-06 07:56:43 -05:00
Ty-Omaha
7382687db4 grammar 2019-11-06 07:50:05 -05:00
Ty-Omaha
da84345a67 Revert "Revert "Updates Naval Officer Outfit""
This reverts commit 24cdaeb413.
2019-11-06 07:43:54 -05:00
Ty-Omaha
24cdaeb413 Revert "Updates Naval Officer Outfit"
This reverts commit e6997dfdbe.
2019-11-06 07:42:46 -05:00
Ty-Omaha
e6997dfdbe Updates Naval Officer Outfit 2019-11-06 07:42:33 -05:00
Ty-Omaha
332dd77896 updates description 2019-11-05 19:41:54 -05:00
Ty-Omaha
3118b77606 Revert "Navy Uniform Fix"
This reverts commit 1119658377.
2019-11-05 19:31:28 -05:00
Ty-Omaha
1119658377 Navy Uniform Fix 2019-11-03 09:11:04 -05:00
Fox McCloud
e25e38c2d7 Makes Pants All Powerful (#12515) 2019-10-08 20:47:32 -04: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
farie82
0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud
238ea19d09 Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm
2019-09-21 12:40:07 -04:00
Ionward
4b87b5b42a Oh, didn't you hear? I'm the King of the Rhumba beat. (#12339) 2019-09-20 17:58:31 -07: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
Fox McCloud
f998cb74ad then-we-shall-reforge-the-armor-from-what-remains 2019-09-10 07:03:05 -04:00
variableundefined
69537dd60c Port TG hitby refactor and detonation of items by projectiles 2019-09-09 22:57:31 -04:00
Fox McCloud
b4863db46f further tweaks 2019-09-05 18:44:55 -04:00
Fox McCloud
dca6d98f5f Refactors Corgis 2019-09-04 18:40:34 -04:00
datlo
23fe308908 Add the banana touch and mime malaise spells 2019-08-28 19:49:52 +02:00
Fox McCloud
eef0bc919d Implements Tailoring 2019-08-26 17:41:39 -04:00
Fox McCloud
812b3b3ccd woops. 2019-08-25 17:48:15 -04:00
Fox McCloud
dd346515e5 additional suits 2019-08-25 17:42:48 -04:00
Fox McCloud
85c6997584 Merge remote-tracking branch 'upstream/master' into plasmamen-rework
# Conflicts:
#	code/modules/mob/living/carbon/human/update_icons.dm
#	icons/obj/device.dmi
#	paradise.dme
2019-08-25 16:51:21 -04:00
Fox McCloud
52b37935f7 commit 2 2019-08-11 23:23:43 -04:00
Fox McCloud
39c9e9abde Reworks Plasmamen 2019-08-11 18:56:32 -04:00
Kyep
fd389810f2 medals in lockers 2019-07-10 20:13:14 -07:00
Aurorablade
896450cd42 Adds Hawaiian Shirts 2019-06-13 22:56:24 -04:00
Mark van Alphen
0e91e91479 Lavaland fixes 2019-05-31 18:26:15 +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