68830dac71
Changes smes, cells, cell charger, terminals and apcs icons
2017-08-16 20:02:24 -05:00
0ffaf66d1f
Merge branch 'master' into upstream-merge-29690
2017-08-15 19:18:22 -05:00
ab27b63cf9
Merge branch 'master' into upstream-merge-29611
2017-08-15 18:55:12 -05:00
41c9cf3a4a
Update machinery.dm
2017-08-15 18:53:10 -05:00
3d83b55cf6
Annihilates the colons!
2017-08-15 10:49:55 -05:00
62eee8804e
Merge pull request #2337 from Citadel-Station-13/upstream-merge-29815
...
[MIRROR] Fixes bad dirs
2017-08-14 22:18:07 -05:00
31b501aa1a
Merge branch 'master' into upstream-merge-29885
2017-08-14 19:41:45 -05:00
64b3fe43d9
Update shieldgen.dm
2017-08-14 19:38:43 -05:00
2719f23e52
Update shieldgen.dm
2017-08-14 18:53:01 -05:00
98ff124b68
Update shieldgen.dm
2017-08-14 18:50:44 -05:00
69bf7e42cf
Merge branch 'master' into upstream-merge-29288
2017-08-14 18:35:28 -05:00
7fe8dd208d
[s] Clean up some inputs
2017-08-14 02:44:24 -05:00
bd35823012
[ready]Makes bIcon better
2017-08-13 17:41:12 -05:00
fca1df9a2b
Fixes bad dirs
2017-08-11 14:54:00 -05:00
94386375a8
Merge pull request #2304 from Citadel-Station-13/upstream-merge-29767
...
[MIRROR] Mechs can no longer open cult doors if the person inside is not a cultist
2017-08-09 02:20:42 -05:00
cc7ad81f79
Adds helpers to avoid << use
2017-08-08 22:28:16 -05:00
68bbda4b4d
Mechs can no longer open cult doors if the person inside is not a cultist
2017-08-08 09:05:50 -05:00
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
b449843a1e
Merge pull request #2270 from Citadel-Station-13/upstream-merge-29711
...
[MIRROR] Fixes oversight with APCs using areastring
2017-08-07 07:18:35 -05:00
c5c25639ee
Merge pull request #2267 from Citadel-Station-13/upstream-merge-29654
...
[MIRROR] Fixes vendors not returning an Initialize hint
2017-08-07 07:17:39 -05:00
a90448b262
Fixes oversight with APCs using areastring
2017-08-05 19:28:33 -05:00
90a7ead961
[MIRROR] The AI's internal camera functions better ( #2219 )
...
* The AI's internal camera functions better
* sync robot.dm and hopefully not break shit
2017-08-05 10:24:58 -07:00
99ca34a7b4
Fixes vendors not returning an Initialize hint
2017-08-05 12:20:34 -05:00
04231f44b1
Improves Porta-Turret Performance ( #2248 )
2017-08-04 08:42:21 -07:00
ef715b7837
Removes all checks for subsystem existence ( #2252 )
2017-08-04 08:41:52 -07:00
1b22c5fe0c
[MIRROR] Separates actions.dmi into multiple files ( #2214 )
...
* Separates actions.dmi into multiple files
* Delete beam_rifle.dm.rej
* Delete action.dm.rej
2017-08-03 06:09:39 -07:00
dd22c79678
Completes major inhand split project ( #2178 )
2017-08-02 06:30:33 -05:00
8a4ddbe8a8
[MIRROR] Ports Rapid Cable Layers from /vg/ and paradise ( #2162 )
...
* Ports Rapid Cable Layers from /vg/ and paradise
* rej clean up + manual sync
* maps and .rej file cleanup
* sprite and WGW memes
* actual spellchecked memes
* some other map fix memes
* fuck it, let's just hard sync maps
* dumb paperwork shit for maps
* Revert "dumb paperwork shit for maps"
This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.
* *autistic screeching*
* REEEEEEEEEEEEEEEEEEEEE
* Fuck off I want to do something else
2017-08-02 04:56:44 -05:00
76f7fcef9a
[MIRROR] Cleaned up paper varedits + tidied up paths ( #2156 )
...
* Cleaned up paper varedits + tidied up paths
* work smarter, not harder
* citadel snowflake
* Update uplink_item_cit.dm
2017-08-02 03:17:32 -05:00
55f1de10a6
Spellchecking
2017-08-01 08:46:20 -05:00
bbcad2fa58
Proper mirror PR for the disease refactor because I fucked up the first one. ( #2026 )
...
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025 )"
This reverts commit 44742cb115
2017-07-31 23:41:22 -07:00
a2f92461a4
Merge pull request #2210 from Citadel-Station-13/upstream-merge-29585
...
[MIRROR] Improves several Sound Loops' Performance
2017-07-31 22:06:17 +02:00
3d53f888b1
Improves several Sound Loops' Performance
2017-07-31 14:35:16 -05:00
4ac6b49871
Corrected holding cell access requirements
2017-07-31 08:58:05 -05:00
35fba1933e
Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
...
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
79e6963aca
Hallucinations 3.0
2017-07-30 19:58:28 -05:00
70a5aed428
Merge pull request #2054 from Citadel-Station-13/upstream-merge-28977
...
[MIRROR] Augment Styles/Changes
2017-07-29 23:56:52 -05:00
9ac752afb4
Makes chemical payload bomb cores less misleading ( #2151 )
2017-07-26 22:56:27 -07:00
cf87bf20f5
makes gulag beacon indestructible ( #2123 )
2017-07-26 00:06:21 -07:00
37b9e24bc0
Removes the gulag sink and water bottles from the sustenance vendor. ( #2094 )
2017-07-24 04:08:56 -07:00
5db90b28dc
Fixes the party alarm ( #2082 )
2017-07-21 07:05:29 -07:00
bfcb068f21
Adds proper containers for some locates ( #2080 )
2017-07-20 06:31:25 -07:00
1e2fd6c235
Merge pull request #2044 from Citadel-Station-13/upstream-merge-29293
...
[MIRROR] Made cell / holding cell windoors their own subtype
2017-07-19 13:41:37 -05:00
27b826a6f1
Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260
...
[MIRROR] Changes all access const to be a define
2017-07-19 13:18:58 -05:00
a7b3516491
Merge pull request #2000 from Citadel-Station-13/upstream-merge-29228
...
[MIRROR] Fixes IV Drips
2017-07-19 05:02:19 -05:00
b497ce09ab
Update iv_drip.dm
2017-07-19 04:52:47 -05:00
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
0ce34e08b6
Augment Styles/Changes
2017-07-18 06:45:44 -05:00
e522f715a2
[Ready] Shuttle dock() rewrite ( #2040 )
2017-07-17 22:52:18 -07:00
755de4f223
Made cell / holding cell windoors their own subtype
2017-07-17 06:52:17 -05:00
CitadelStationBot