86edafb132
lol
2017-10-09 01:06:50 -05:00
a35b84cc2e
Merge pull request #3208 from Citadel-Station-13/upstream-merge-31386
...
[MIRROR] Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-08 16:18:18 -04:00
bc2b6b01c1
Update target_stake.dm
2017-10-07 22:50:50 -05:00
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
13aa6f8650
Lets cyborgs use ladders ( #31378 )
2017-10-07 08:40:15 -05:00
25cf971fef
Merge pull request #31275 from kingofkosmos/moredeconhints
...
Adds deconstruction hints to various things
2017-10-04 16:33:51 -05:00
b9967e6453
Update medical.dm
2017-10-03 18:48:43 -05:00
1782fbeed7
Adds the advanced medical scanner, gives one to the CMO
2017-10-03 18:16:29 -05:00
b19f88c2dc
Update mineral_doors.dm
2017-10-02 17:32:42 -05:00
3e26e09db8
ismecha define
2017-10-02 01:04:53 -05:00
2cafd6fefb
Merge pull request #3060 from Citadel-Station-13/upstream-merge-31086
...
[MIRROR] Adds desc to things lacking them.
2017-10-01 23:37:35 -04:00
fc89d769f0
Merge pull request #3056 from Citadel-Station-13/upstream-merge-31130
...
[MIRROR] Adds the Cargo-Tech-of-the-Shift award
2017-10-01 23:37:26 -04:00
76d6402a9d
Update windoor_assembly.dm
2017-10-01 15:46:31 -05:00
4a4ecdf211
Update transit_tube_construction.dm
2017-10-01 15:46:20 -05:00
f3ae038f6c
Update cargo.dm
2017-10-01 15:35:27 -05:00
f0379ec3f3
Merge pull request #3042 from Citadel-Station-13/upstream-merge-30605
...
[MIRROR] You can now examine an airlock to find out how to construct/deconstruct it
2017-10-01 16:30:40 -04:00
82981339ed
Adds desc to things lacking them.
2017-10-01 15:07:37 -05:00
3a83b28bae
Adds the Cargo-Tech-of-the-Shift award
2017-10-01 09:43:20 -05:00
81e40cc5c8
Merge pull request #2981 from Citadel-Station-13/upstream-merge-30763
...
[MIRROR] Configuration datum refactor
2017-10-01 02:50:17 -04:00
f55c86edfb
Merge branch 'master' into upstream-merge-31045
2017-10-01 01:17:52 -04:00
0f387451f7
You can now examine an airlock to find out how to construct/deconstruct it ( #30605 )
...
* Tweaks rwall construction examine-messages.
* Tweaks window construction examine-messages.
* Added airlock construction examine messages.
* Typo fix.
* Shortened the airlock electronics circuit message.
* Fixed examine text styles.
* Fixes.
* Fixed wall-examine showing on rwalls.
* Made wall and rwall decon hints into a proc. Probably overrode the examine() wrong.
* I missed a > in span. Reinforced falsewall now deconstructs with wirecutters and looks like a real rwall. Changed to a more classy istype-check.
* New reinforced fakewall examine- and attackby-subtypes to get rid of if-istype-reinforced-checks.
* Removed unnecessary rwall-examine.
* Sound full path.
2017-10-01 00:04:14 -05:00
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
47a65d829d
Merge branch 'master' into upstream-merge-29741
2017-09-30 13:35:47 -04:00
f1858a3a63
Merge pull request #2996 from Citadel-Station-13/upstream-merge-30988
...
[MIRROR] Alt-clicking descriptions when examining
2017-09-30 12:57:52 -04:00
3ec5a637e5
Fixes dresser being unattackable ( #31123 )
2017-09-30 10:30:09 -05:00
be08e0c29f
Update mirror.dm
2017-09-29 23:42:12 -05:00
e4b4860e44
Reebe is fancier now
2017-09-28 21:59:05 -05:00
f0c684c15e
Alt-clicking descriptions when examining
2017-09-28 21:51:53 -05:00
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
d8de375ada
Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969
...
[MIRROR] DisplayTimeText mk2
2017-09-27 23:39:03 -04:00
f3da8a48a0
Update critter.dm
2017-09-27 19:11:11 -05:00
10bf80139c
Fixes MMI to AI law transfer ( #31017 )
...
* Fixes MMI to AI law transfer
* Fixes issue with preloaded laws on AI core
2017-09-26 16:52:17 -05:00
e575bd6685
(Ready) Clockwork Cult Rework: Proof-of-concept
2017-09-26 15:22:09 -05:00
169aa85d9c
DisplayTimeText mk2
2017-09-24 18:59:57 -05:00
11a3395690
Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart
2017-09-24 17:42:13 -05:00
92c693ecc7
Merge pull request #2924 from Citadel-Station-13/upstream-merge-30961
...
[MIRROR] You can now Indiana Jones one explosion.
2017-09-24 11:33:39 -04:00
ac8e74e517
Update freezer.dm
2017-09-24 08:35:36 -05:00
60bdb54024
You can now Indiana Jones one explosion.
2017-09-23 23:34:04 -05:00
08d4b2084e
Update ghost_role_spawners.dm
2017-09-23 02:32:44 -05:00
391c82e68d
Update ghost_role_spawners.dm
2017-09-23 02:23:32 -05:00
28e9bc7d8c
added a IC clause to make enforcement easier.
2017-09-23 02:18:02 -05:00
2a860d1954
[MIRROR] More Initialize() fixes, requires someone to test with DB ( #2857 )
...
* More Initialize() fixes, requires someone to test with DB
* fucking mirror failure
2017-09-22 23:35:22 -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
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
41277ff110
Removes old debug text
2017-09-21 06:30:11 -05:00
7c0e17236d
Fixes safes not having adjacency checks ( #30859 )
...
* Update safe.dm
* Update safe.dm
2017-09-19 10:56:51 -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
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
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
LetterJay