497e6bb13f
Various deadchat messages are more informative and consistent ( #34326 )
...
More deadchat messages now follow the following format.
> George Mellons has done a thing at AreaName.
- Shuttle calling
- Shuttle recalling
- Security level changing
- Maintenance accessing
- Swiping for red,emergency maint, bsa
- Messenging centcom, syndicate
Fixes #34230 .
Fixes #34231 .
2018-01-15 02:56:10 -06:00
af1d40ca52
Tweaks spaceheater description ( #34416 )
...
* Update spaceheater.dm
* Update spaceheater.dm
* Update spaceheater.dm
* Update spaceheater.dm
* Update spaceheater.dm
* Update spaceheater.dm
* Allah my loving lord and savior grant me mercy
2018-01-14 22:03:57 -06:00
80095fea0a
Replaces cached get_area vars for names ( #34338 )
2018-01-13 20:56:11 -06:00
9c17444c5f
Merge pull request #34313 from AutomaticFrenzy/patch/airlock-controller
...
Fix airlock console HTML
2018-01-12 12:57:52 -06:00
62cfb99cb7
Merge pull request #4788 from Citadel-Station-13/upstream-merge-34310
...
[MIRROR] Removes some hrefs from logging
2018-01-12 17:48:13 +00:00
63354404e4
Merge pull request #4782 from Citadel-Station-13/upstream-merge-34260
...
[MIRROR] Adds an indestructible disco/dance machine for admemes and disco inferno shuttle
2018-01-12 17:46:00 +00:00
0c56db4f9b
Merge pull request #4764 from Citadel-Station-13/upstream-merge-34090
...
[MIRROR] Replace hardcoded z-level numbers with a trait system
2018-01-12 17:41:28 +00:00
ed6ec3d63a
Removes some hrefs from logging ( #34310 )
...
* Removes key_name_admin calls from logging
* Removes JMP from gibtonite reaction logs
2018-01-12 07:04:39 -06:00
af73323477
Adds an indestructible disco/dance machine for admemes and disco inferno shuttle ( #34260 )
...
* Dance machine fix
* I have no ass and i must blast
2018-01-11 21:36:56 -06:00
c98be44b33
Merge pull request #4762 from Citadel-Station-13/upstream-merge-33817
...
[MIRROR] [READY]Pulling claw 2
2018-01-11 15:19:11 -06:00
72319a9794
Replace hardcoded z-level numbers with a trait system
2018-01-11 14:06:17 -06:00
1d91243ae2
[READY]Pulling claw 2 ( #33817 )
...
Pulling claw is integrated circuit,which allows drones to pull things.
2018-01-11 14:03:52 -06:00
149542ca26
Replace CentComm with CentCom in deadchat message ( #34249 )
2018-01-11 07:39:52 -06:00
e4410a3320
Merge branch 'master' into mapsyncs43293845982
2018-01-08 06:18:11 +00:00
57d8457108
Merge pull request #4705 from Citadel-Station-13/upstream-merge-33645
...
[MIRROR] Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog
2018-01-08 04:15:47 +00:00
c3712f5be5
Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog ( #33645 )
...
* Objects touched by servants now warp to the Ark
* Check by servant
* Replaces with a baselock
* Updates the 'log
2018-01-07 20:18:28 -06:00
ff80771081
Fixes comms console dchat announcing announcements even if they didn't happen for whatever reason ( #34157 )
...
* Fixes dchat broadcast
* Update communications.dm
2018-01-07 18:51:16 -06:00
d2ec28b1e6
Merge branch 'master' into mapsyncs43293845982
2018-01-07 20:23:00 +00:00
015c46cbae
Removed some superfluous stack code ( #34083 )
2018-01-05 06:01:36 -06:00
e6ec24d13c
Merge branch 'master' into mapsyncs43293845982
2018-01-05 02:03:51 +00:00
bf3468f61c
Adds more observation messages in deadchat ( #34075 )
...
* Adds more observation messages
* so bold kobold
* caching
2018-01-04 15:16:58 -06:00
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
6d1095a3cb
Merge pull request #4603 from Citadel-Station-13/upstream-merge-33917
...
[MIRROR] Always use the area name when selecting a teleport beacon
2018-01-03 04:56:55 -06:00
3a2deb1d49
Merge branch 'master' into upstream-merge-33601
2018-01-02 18:26:18 -06:00
4dcc65a6bc
Merge branch 'master' into upstream-merge-33917
2018-01-02 17:14:53 -06:00
6b1f18d60c
Merge pull request #4636 from Citadel-Station-13/upstream-merge-34021
...
[MIRROR] Fixes ocky icky in the bank vault
2018-01-02 15:47:01 -06:00
6c606654c3
Removes icky ocky from the vault ( #34021 )
2018-01-02 13:31:28 -06:00
30d4b25aee
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829
2018-01-01 14:09:07 -06:00
168519c328
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311
2018-01-01 07:00:34 -06:00
07adb3fdd6
Update teleporter.dm
2018-01-01 04:06:33 -06:00
4899131230
Update teleporter.dm
2018-01-01 04:06:14 -06:00
7a6cf002d3
Revert "[MIRROR] Fix PDA message photos not being viewable"
2017-12-31 06:41:03 -06:00
515c4a0472
Merge pull request #4611 from Citadel-Station-13/upstream-merge-33940
...
[MIRROR] Fix PDA message photos not being viewable
2017-12-31 02:52:03 -06:00
503f8e2635
Merge pull request #4605 from Citadel-Station-13/upstream-merge-33805
...
[MIRROR] Fixed autolathes and ore redemption machines leaving things at previous shuttle locations
2017-12-31 02:50:21 -06:00
38870f4056
Fix PDA message photos not being viewable
2017-12-30 21:27:31 -06:00
4237a8910c
Merge pull request #4483 from Citadel-Station-13/upstream-merge-33682
...
[MIRROR] Makes newscaster feedback messages and comments always a list.
2017-12-30 14:13:03 -06:00
3802cf8586
Merge pull request #33805 from Cruix/shuttle_machines
...
Fixed autolathes and ore redemption machines leaving things at previous shuttle locations
2017-12-30 13:56:43 -06:00
75f492f416
Always use the area name when selecting a teleport beacon
2017-12-30 13:55:17 -06:00
7c69a835be
Update teleporter.dm
2017-12-30 13:32:29 -06:00
47174097e1
Update communications.dm
2017-12-30 13:32:19 -06:00
8452cc74d0
Update newscaster.dm
2017-12-30 13:21:31 -06:00
b260704381
Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705
...
[MIRROR] Turns the baseturf var into a part time list
2017-12-30 13:19:00 -06:00
a3ebaa5de8
Merge branch 'master' into upstream-merge-32311
2017-12-29 18:38:50 -06:00
0418ee4df6
Replace explicit z-level checks with defines
2017-12-29 13:41:10 -06:00
d38a4a2aa5
Merge pull request #33905 from ShizCalev/jumpsuit-fix
...
Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
2017-12-29 10:10:30 -06:00
a64a1e4a5c
Merge branch 'master' into upstream-merge-33783
2017-12-29 06:49:47 -06:00
518b264654
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783
...
# Conflicts:
# _maps/map_files/generic/CentCom.dmm
# code/modules/mob/living/living.dm
2017-12-29 01:34:17 -06:00
6fac704a4f
Fixes AI eyes getting nullspaced when jumping to deleted cameras ( #33856 )
2017-12-29 00:28:47 -06:00
2ac9d9a171
Merge pull request #4554 from Citadel-Station-13/upstream-merge-33858
...
[MIRROR] Adds open/close sound to blastdoors and shutters
2017-12-28 23:57:40 -06:00
b8dc623ebc
Update poddoor.dm
2017-12-27 21:57:51 -05:00
coiax