2757fae7e2
[MIRROR] Fixes shaving headless mobs ( #2890 )
...
* Fixes shaving headless mobs
* Update cosmetics.dm
2017-09-22 22:31:54 -05:00
2c78f7122c
[MIRROR] Adds some new plushies ( #2866 )
...
* Adds some new plushies
* Update packs.dm
2017-09-22 22:31:07 -05:00
6efb76fad5
[MIRROR] Ammo cleanup ( #2643 )
...
* Ammo cleanup
* Update briefcase.dm
* Update manned_turret.dm
* Update mime.dm
* Update manned_turret.dm
* Update manned_turret.dm
* fixes
* mime memes
2017-09-22 22:30:44 -05:00
c85e409872
[MIRROR] Removes the multiverse and its sword ( #2573 )
...
* Merge pull request #30283 from pubby/multiverse
Removes the multiverse and its sword
* Removes the multiverse and its sword
2017-09-22 20:23:56 -05:00
3e2f638793
[MIRROR] Cleans up internal temp code ( #2853 )
...
* Cleans up internal temp code (#30715 )
* cleanup
* Update living.dm
* Update atoms.dm
* Update objs.dm
* Cleans up internal temp code
* Update living.dm
* Update living.dm
* fixes then ommits mob_temp stuff.
* wew lad. commenting shit out is picky af.
2017-09-22 20:20:56 -05:00
8ef3861b0b
[MIRROR] New squeaky datum and plushes ( #2847 )
...
* New squeaky datum and plushes
* Update bananashoes.dm
2017-09-22 19:43:56 -05:00
573a81a4d9
Reapplies material componets
2017-09-22 09:31:39 -05:00
54bd982d6b
Merge pull request #2787 from Citadel-Station-13/upstream-merge-30681
...
[MIRROR] Prevents the creation of Shadowzombiechangelings
2017-09-22 08:43:37 -04:00
8c6c57ff32
Merge pull request #2885 from Citadel-Station-13/upstream-merge-30896
...
[MIRROR] Removes old debug text
2017-09-22 00:03:30 -04:00
41277ff110
Removes old debug text
2017-09-21 06:30:11 -05:00
dae93856f5
Traitorbro fixes
2017-09-20 03:48:33 -05:00
accd92a676
[MIRROR] Fixes mode conversion runtime ( #2855 )
...
* Fixes mode conversion runtime (#30857 )
* Fixes mode conversion runtime
2017-09-20 01:40:52 -05:00
6d717995a4
Update meteors.dm ( #2867 )
2017-09-20 01:40:09 -05:00
50e9dd17b6
Merge pull request #2801 from Citadel-Station-13/upstream-merge-30745
...
[MIRROR] Dice will now roll when thrown
2017-09-19 12:20:34 -04:00
7c0e17236d
Fixes safes not having adjacency checks ( #30859 )
...
* Update safe.dm
* Update safe.dm
2017-09-19 10:56:51 -05:00
ecce4cf138
[MIRROR] New DCS signals ( #2741 )
...
* New DCS signals
* Update atoms.dm
* actually ports comsigs
2017-09-19 07:00:08 -05:00
628a2442e2
[MIRROR] Slightly remaps and adds more supplies to the animal hospital ruin ( #2705 )
...
* Merge pull request #30505 from Xhuis/vet_remap
Slightly remaps and adds more supplies to the animal hospital ruin
* Slightly remaps and adds more supplies to the animal hospital ruin
2017-09-19 06:37:56 -05:00
b6fdbb54f5
Update dice.dm
2017-09-19 06:35:36 -05:00
170f5d7a5e
[MIRROR] Log file for PDA messages ( #2848 )
...
* log file for pda messaegs (#30827 )
* Log file for PDA messages
2017-09-19 06:34:53 -05:00
19309d76d0
Merge pull request #2840 from Citadel-Station-13/upstream-merge-30344
...
[MIRROR] Traitorbro gamemode
2017-09-18 08:35:00 -04:00
d4a577014a
[MIRROR] Fixes esaw icon ( #2831 )
...
* Fixes esaw icon
* Update energy.dm
2017-09-18 01:46:20 -05:00
d8a1fc936e
[MIRROR] Stops AIs from taking actions while depowered ( #2813 )
...
* Stops AIs from taking actions while depowered
* Update ai.dm
2017-09-18 01:45:59 -05:00
4bc6e9d522
[MIRROR] Cleaned up some decimal values. ( #2797 )
...
* Cleaned up some decimal values.
* Update gas_mixture.dm
* Update color.dm
* Update medsci.dm
2017-09-18 01:45:39 -05:00
83ec9b6d26
[MIRROR] Cleans up showcase & plaque varedits, updated loyalty implant references ( #2768 )
...
* Cleans up showcase & plaque varedits, updated loyalty implant references (#30698 )
* Cleans up showcase varedits
* drop_location for oldpods
* Plaques + more loyalty implant references
* Cleans up showcase & plaque varedits, updated loyalty implant references
2017-09-17 23:07:05 -05:00
7299854f8b
[MIRROR] Puts the computer circuit board back in nullspace where it supposedly belongs ( #2810 )
...
* Puts the computer circuit board back in nullspace where it supposedly belongs
* Update _computer.dm
2017-09-17 22:55:04 -05:00
e2e85e9294
[MIRROR] Window Spawner Refactor ( #2815 )
...
* Window spawner refactor (#30747 )
* Window Spawner Refactor
2017-09-17 22:42:22 -05:00
201cb984c8
[MIRROR] Fix ingredient box icon (again) ( #2823 )
...
* Fix ingredient boxes
* Fix ingredient box icon (again)
2017-09-17 22:36:21 -05:00
4dd0dc9d66
[MIRROR] Various grammar fixes ( #2842 )
...
* Various grammar fixes
* Update mecha_parts.dm
* Update crates.dm
* Update ghost_role_spawners.dm
* Update paper_premade.dm
* Update oldstation.dm
2017-09-17 22:35:51 -05:00
c8b153ee71
[MIRROR] Varedit cleanup mk4 ( #2833 )
...
* Varedit cleanup mk4 (#30794 )
* Cleans up and corrects a bunch of varedits
* Plant varedits
* More layers
* Adjusted plant name/description
* Varedit cleanup mk4
2017-09-17 22:31:30 -05:00
8846708727
[MIRROR] Fixes cyborg airlock interaction ( #2827 )
...
* Fixes cyborg airlock interaction (#30809 )
* changes the sheet check to respect cyborgs
* Uses the proc instead of a hack that we wound need to fix again
* I can code totaly, yeah, sober...
* I cant posibly be drunk yet i only GOT the wine a minute ago
* Fixes cyborg airlock interaction
2017-09-17 22:25:59 -05:00
b1ba49f37e
[MIRROR] Blobbernauts are healed quicker by cores and nodes ( #2821 )
...
* Blobbernauts are healed quicker by cores and nodes (#30527 )
* Blobbernauts are healed quicker by cores and nodes
i hate sitting for 3-5 minutes waiting to heal as a naut
* no you can't heal without a factory
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Blobbernauts are healed quicker by cores and nodes
2017-09-17 22:23:08 -05:00
d0c9f79a37
[MIRROR] Makes building with plasma glass a thing. ( #2820 )
...
* Makes building with plasma glass a thing. (#30800 )
* Makes building with plasma glass a thing.
* Updated grille.dm
* Makes building with plasma glass a thing.
2017-09-17 22:22:50 -05:00
29a2309f70
[MIRROR] Fixes the issue of potted plants not having their overlays when picked up/equipped. ( #2822 )
...
* Fixes the issue of potted plants not having their overlays when picked up/equipped.
* Fixes the issue of potted plants not having their overlays when picked up/equipped.
2017-09-17 22:20:58 -05:00
597c02135a
[MIRROR] Maybe fix shuttle issues ( #2841 )
...
* Merge pull request #30819 from MrStonedOne/patch-425
Maybe fix shuttle issues
* Maybe fix shuttle issues
2017-09-17 21:35:42 -05:00
a01f3213f5
Traitorbro gamemode
2017-09-17 18:03:12 -05:00
b09aa9d082
[MIRROR] Fixes stacking when crafting items ( #2814 )
...
* Merge pull request #30746 from YPOQ/stackfix
Fixes stacking when crafting items
* Fixes stacking when crafting items
2017-09-17 12:03:31 -05:00
ada383e629
[MIRROR] Clarifies the egyptian staff desc ( #2811 )
...
* Clarifies the egyptian staff desc (#30765 )
* Clarifies the egyptia staff desc
* I can't write
* Clarifies the egyptian staff desc
2017-09-17 12:03:12 -05:00
69c1d74f65
[MIRROR] Corrects killroom turf gas mixture ( #2805 )
...
* Corrects killroom turf gas mixture
* Corrects killroom turf gas mixture
2017-09-17 12:00:59 -05:00
acc2104068
[MIRROR] Adds href token to station name rejection ( #2798 )
...
* Adds href token to station name rejection (#30740 )
* Adds href token to station name rejection
* Update charter.dm
* Adds href token to station name rejection
2017-09-17 12:00:39 -05:00
768c90fc03
[MIRROR] Removes vine floors and their sprite ( #2807 )
...
* Removes vine floors and their sprite (#30778 )
* removes vine floors and their sprite
* Once more, with feeling
* Revert "Merge branch 'kudzufix' of https://github.com/vuonojenmustaturska/tgstation into kudzufix"
This reverts commit 89d99caa75dcadabebdf44a6e4b6c40b2914156a, reversing
changes made to 92e89ed02b767b927a83ee3a878b6eb38f590c5c.
* Removes vine floors and their sprite
2017-09-17 12:00:19 -05:00
cbfee7e313
[MIRROR] Tank gauge rounding fix ( #2800 )
...
* Merge pull request #30749 from ShizCalev/tank-display-fix
Tank gauge rounding fix
* Tank gauge rounding fix
2017-09-17 11:58:50 -05:00
d96f3f40a5
[MIRROR] PDA game log entry contains ckey ( #2808 )
...
* PDA game log entry contains ckey
* PDA game log entry contains ckey
2017-09-17 11:58:11 -05:00
dd4f68dfee
Cleans up .rej spam and the empty file from #2792 ( #2818 )
...
* Cleans up .rej spam and the empty file from #2792
* Update tgstation.dme
2017-09-17 11:56:55 -05:00
7cf4d0797b
Applies WRITE_FILE to Citadel saves + Belly clone fix ( #2694 )
...
* Applies WRITE_FILE to everything
* Maybe this works, actually
* HAHAH I FIXED IT FUCKOS
2017-09-17 02:26:27 -05:00
422373e649
Dice will now roll when thrown
2017-09-16 11:37:38 -05:00
71719f6787
Update _computer.dm
2017-09-16 09:19:47 -05:00
e4af04823a
[MIRROR] Fix pressure plate spam ( #2775 )
...
* Fix pressure plate spam (#30736 )
* Fix pressure plate spam
* Not everything has feet
* Pressure plates . = ..()
* Fix pressure plate spam
2017-09-16 04:35:45 -05:00
1db4249fa1
[MIRROR] Adds Abandoned Airlocks ( #2784 )
...
* Adds Abandoned Airlocks (#30705 )
* Automatic changelog generation for PR #30056 [ci skip]
* Delete AutoChangeLog-pr-30056.yml
* Abandoned Airlocks
* Added to maps
* inclusive numbering
* Update airlock.dm
* Tweaks
* Capital ChangeTurf
* Update airlock.dm
* no more update_icons
* Abandoned paths (#4 )
* Abandoned paths
* Cleaned up dirty var
* Adds Abandoned Airlocks
2017-09-16 04:32:19 -05:00
a91f7efe5e
[MIRROR] Fixes the doomsday device announcements ( #2789 )
...
* Fixes the doomsday device announcements
* Fixes the doomsday device announcements
2017-09-16 04:31:46 -05:00
ccd55bb779
[MIRROR] Remove /obj/proc/gang_contraband_value ( #2799 )
...
* Remove /obj/proc/gang_contraband_value() (#30744 )
unused
* Remove /obj/proc/gang_contraband_value
2017-09-16 04:31:22 -05:00
CitadelStationBot