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
9f49a42d15
Refactor closet and RCS code. Can't put items in closets on modes other than help ( #13464 )
...
* Refactor closet and RCS code. Can't put items in closets on modes other than help
* Undef
* Styling tweaks
* Github reviews and extra
* glob.machines
2020-06-26 02:24:35 -06:00
2c08ce843f
personal locker fix
2020-06-08 22:33:29 -05:00
973e53be14
nevermind this should go after
2020-06-06 10:04:46 -05:00
158c4e241e
fix
2020-06-06 09:55:09 -05:00
c87e4bd5c7
Merge pull request #12950 from Aquilar/blueprintpinpointerfix
...
Fixes steal station blueprints objective
2020-05-01 18:36:08 -04:00
928a8f0e04
Makes the code pass dreamchecker ( #13161 )
...
* Initial Commit - Trying to add DC to Travis
* Forgot to chmod
* This took too long
* Farie Fixes
* Fixes new code
* Job factions are fucking smelly
* Loadouts work again
* Runtime fixes
2020-04-11 15:59:16 -06:00
898ca53e71
deconflict
...
Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com >
2020-03-18 15:09:43 +08:00
25102492c0
Merge branch 'master' into blueprintpinpointerfix
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2020-03-18 15:06:19 +08:00
8e75487346
Fixes CLRF
2020-03-17 17:43:11 -05:00
230e3d8abc
Merge branch 'master' into adddefibs
2020-03-17 17:26:29 -05:00
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
a65bb8e1e6
Zap Zap
2020-03-14 15:21:50 -05:00
fa84366203
Added an icon to differentiate the blueprints from the CE's blueprints. purely to prevent confusion.
...
Fixed the pinpointer from pointing to cyborg and slime blueprints by;
Changing the steal objectives to require the CE's copy of the blueprints exclusive. Which required changing few lines in various places that reference that specific copy.
Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com >
missed the line in photography.dm
2020-02-01 19:06:03 +08:00
c64bc93649
Replaces all var/const with #define
2020-01-28 21:25:20 +00:00
3ae71f7932
Merge pull request #12245 from Fox-McCloud/universal-damage
...
Universal Object Damage
2019-10-06 23:22:48 -04:00
67dc33ac3f
for-the-strength-from-which-he-gives-is-unerring
2019-10-05 02:08:11 -04:00
5170f3fbae
the-strength-of-this-world-fades
2019-10-04 19:34:08 -04:00
20c4cf0a08
for-if-I-stand-I-stand-by-his-will-alone
2019-10-03 19:52:03 -04:00
a97d050f4b
Syringe Refactor. Overhauls Lethal Injection Syringe
2019-09-30 18:25:36 -04:00
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
80bb221891
Adds an ATMOS Holofan Creator to the Chief Engineer's locker ( #12419 )
2019-09-26 16:59:20 -07:00
aa49033844
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
d015c0c2b2
even-still-though-time-itself-be-shattered
2019-09-16 01:35:25 -04:00
af92373d33
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
1bfb442d40
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-14 21:15:31 -04:00
f998cb74ad
then-we-shall-reforge-the-armor-from-what-remains
2019-09-10 07:03:05 -04:00
42564c65f3
Refactors Atmos Air Current Pushing
2019-09-09 20:11:26 -04:00
b75db54b1f
Merge pull request #12015 from SteelSlayer/atmos-QoL
...
Atmos tech QoL & Disposal pipe tweaks
2019-08-28 11:14:17 -04:00
9f2f9cfa6c
Merge remote-tracking branch 'upstream/master' into ports-tailoring
2019-08-27 18:23:11 -04:00
722df75be4
Merge pull request #12090 from Fox-McCloud/jetpack-upgrade
...
Ports Jetpack Upgrades. Removes Jetpack Suit Storage
2019-08-27 17:39:19 -04:00
0b46603e38
Merge pull request #12078 from SteelSlayer/paramedic-hand-defib
...
Adds a handheld defibrillator to the paramedic EVA closet
2019-08-27 02:40:31 -04:00
eef0bc919d
Implements Tailoring
2019-08-26 17:41:39 -04:00
899eb9c948
Ports Jetpack Upgrades. Removes Jetpack Suit Storage
2019-08-26 00:11:42 -04:00
e1f4a08c54
Adds hand defib to the paramedic EVA closet
2019-08-25 00:49:02 -04:00
cb6df7092c
Hardsuit Helmets Integration
2019-08-24 18:36:27 -04:00
e0a34a179b
Adds destination tagger to atmos locker
2019-08-17 13:07:35 -04:00
bddc7132c2
Merge https://github.com/ParadiseSS13/Paradise into pillbottle
2019-08-12 16:36:43 +02:00
fd389810f2
medals in lockers
2019-07-10 20:13:14 -07:00
de9da04572
Standardized colors, finished change wrapper choosing and modified templates and their sizes
2019-06-30 19:46:13 +02:00
16a81d2527
Merge https://github.com/ParadiseSS13/Paradise into pillbottle
2019-06-30 16:09:38 +02:00
d33d018e62
Finished colors for other prespawned pillbottles, new colors, finished template for changing wrappers in chemmaster
2019-06-30 16:08:33 +02:00
6faf9c769f
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/modules/mob/living/simple_animal/friendly/farm_animals.dm
# paradise.dme
2019-04-17 22:46:43 +02:00
93118f9d34
Remaps Toxins
2019-04-11 07:24:16 -04:00
c597c9be51
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/game/turfs/simulated/floor/plating.dm
# code/modules/clothing/suits/jobs.dm
# icons/mob/suit.dmi
# icons/obj/clothing/suits.dmi
2019-04-11 07:27:51 +02:00
ba7491fa49
cleaned up and made all mantles a child of the base mantle
2019-04-09 02:54:06 -07:00
a792d46085
adds mantles! 3 public access ones (in default clothes vendor,) and 6 command ones, each in their respective heads' lockers.
2019-04-09 01:06:19 -07:00
1689e46f1e
Added Syndicate base and ported over turf decals
2019-03-31 20:26:02 +02:00
45a066c7d1
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/modules/food_and_drinks/recipes/recipes_grill.dm
2019-03-30 22:55:09 +01:00
f92be2c67d
Add Beach biodome ruin and other fixes
2019-03-30 22:48:11 +01:00
Fox McCloud