LetterJay
1939e96bb6
Merge branch 'master' into upstream-merge-32183
2017-11-15 10:22:40 -06:00
kevinz000
eba429f5b1
Hand teleporter and portal fixes. ( #32689 )
2017-11-14 13:11:55 -06:00
LetterJay
14944d8711
Merge branch 'master' into upstream-merge-32183
2017-11-12 23:09:55 -06:00
Leo
fffe2ea0c0
Adds a multitool_act and a proper check on tool_check ( #32640 )
2017-11-12 19:12:46 -06:00
LetterJay
ef700ef8d7
Merge pull request #3898 from Citadel-Station-13/upstream-merge-32627
...
[MIRROR] Fixes AI anti-cheat false positives
2017-11-12 08:21:56 -06:00
LetterJay
07afeccfe9
Merge pull request #3885 from Citadel-Station-13/upstream-merge-32602
...
[MIRROR] Items no longer need to check for tools in attackby
2017-11-12 08:21:26 -06:00
YPOQ
561b9b88f4
Fixes AI anti-cheat false positives ( #32627 )
2017-11-12 02:08:13 -06:00
Leo
73cb2ead88
Items no longer need to check for tools in attackby
2017-11-11 14:31:12 -06:00
MoreRobustThanYou
ecf49cd0a0
ok now i kinda tested the ark examine ( #32445 )
...
* No, I did NOT test the Ark examine.
* Update countdown.dm
* Update ark_of_the_clockwork_justicar.dm
* Update ark_of_the_clockwork_justicar.dm
* OK JOAN FIXED
* Update ark_of_the_clockwork_justicar.dm
2017-11-09 20:57:39 -06:00
LetterJay
a9d8bf1c7a
Merge pull request #3822 from Citadel-Station-13/upstream-merge-32379
...
[MIRROR] Scale fullscreen overlays to the view size
2017-11-09 03:24:57 -06:00
LetterJay
5dcad7c40a
Update fullscreen.dm
2017-11-07 04:38:56 -06:00
LetterJay
4a8978a74d
Update fullscreen.dm
2017-11-07 03:25:28 -06:00
LetterJay
6a1c0f6683
Update screen_objects.dm
2017-11-07 03:24:40 -06:00
AnturK
2e0aaf8598
Ling datum antag standarization.
2017-11-05 19:32:59 -06:00
Tad Hardesty
a0801a8e92
Scale fullscreen overlays to the view size
2017-11-05 04:52:40 -06:00
Jordan Brown
a4665bc7cd
Fixed required images being in the config folder
2017-11-03 23:35:06 -05:00
XDTM
d04b5cbeef
Ghosts can now Health Scan ( #31640 )
...
* Ghosts can now Health Scan
* cyberbossing
* Update observer.dm
2017-11-02 08:46:42 -05:00
Tad Hardesty
4e0a5bf3de
Fix ghosts causing portals to spark
2017-11-02 01:24:50 -05:00
vuonojenmustaturska
53c9c16fe3
one more thing to allow more mobs to qdel nicely ( #32168 )
2017-10-29 07:14:44 -05:00
LetterJay
0e553b26db
Merge branch 'master' into upstream-merge-31737
2017-10-28 02:20:25 -04:00
vuonojenmustaturska
1794018ae1
Removes mob.lastattacked and replaces lastattacker with a string
2017-10-22 11:29:35 -05:00
Poojawa
62273a3867
Merge branch 'master' into upstream-merge-31737
2017-10-21 07:18:14 -05:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
CitadelStationBot
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
LetterJay
72c8c8318d
Merge pull request #3507 from Citadel-Station-13/upstream-merge-31819
...
[MIRROR] Fixes AI visiblity checks
2017-10-19 09:24:28 -04:00
YPOQ
d04818e6f9
Fixes AI visiblity checks ( #31819 )
2017-10-19 05:42:52 -05:00
kevinz000
0aa2e6b6a2
Adds type checks to HUD alert clicks to prevent ghosts from causing runtimes ( #31609 )
...
* Update alert.dm
* better fix
2017-10-19 02:01:14 -05:00
LetterJay
568ed91f28
Merge pull request #3430 from Citadel-Station-13/upstream-merge-30599
...
[MIRROR] Moves projectile processing to a subsystem
2017-10-16 10:39:41 -04:00
LetterJay
11769ef9f8
Update other_mobs.dm
2017-10-16 06:13:41 -05:00
kevinz000
ed96224d3a
Moves projectile processing to a subsystem
2017-10-15 21:51:24 -05:00
Jordan Brown
f205911b5a
Adds defines for organ slots
2017-10-15 19:34:42 -05:00
Jordan Brown
3d50fec086
Merge pull request #31714 from DaxDupont/screaminginternally
...
Fixes "permenant" and "permenantly" typos in code/comments.
2017-10-15 11:32:13 -05:00
Jordan Brown
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
LetterJay
c7617dc4a4
Merge pull request #3169 from Citadel-Station-13/upstream-merge-31326
...
[MIRROR] Cleans up leftover Hand of God gamemode references
2017-10-07 01:02:12 -04:00
LetterJay
da2ee4b4b1
Update _defines.dm
2017-10-06 22:20:27 -05:00
ShizCalev
20c5749416
Cleans up leftover Hand of God gamemode references
2017-10-05 18:17:21 -05:00
XDTM
5b0b2fd5bb
Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby()
2017-10-05 10:53:47 -05:00
Leo
951c9d04f2
Merge pull request #31261 from AnturK/lockedslot
...
Fixes species locked slots alpha.
2017-10-04 06:12:46 -05:00
Leo
cdfc5ffc0c
Merge pull request #31231 from AnturK/longenoughiruntimelogtopissmeoff
...
Fixes alt-click runtime
2017-10-03 06:18:33 -05:00
LetterJay
2c219ba814
Merge pull request #3077 from Citadel-Station-13/upstream-merge-31192
...
[MIRROR] ismecha define
2017-10-02 21:11:59 -04:00
LetterJay
39ef613076
Update screen_objects.dm
2017-10-02 19:37:03 -05:00
KorPhaeron
3e26e09db8
ismecha define
2017-10-02 01:04:53 -05:00
LetterJay
06b30d3e73
[MIRROR] Fixes krav maga working while stunned
...
closes #3073
2017-10-01 22:52:58 -05:00
LetterJay
f621fb704b
Merge branch 'master' into upstream-merge-31069
2017-10-01 02:56:28 -04:00
LetterJay
0cc54029e2
Merge pull request #3010 from Citadel-Station-13/upstream-merge-31096
...
[MIRROR] Cleans up some unused code
2017-10-01 01:19:36 -04:00
LetterJay
6ec50aeae2
Update observer.dm
2017-09-30 14:20:50 -05:00
vuonojenmustaturska
98d6927eb6
Cleanup to various loc assignments and nearby code
2017-09-30 08:10:52 -05:00
ShizCalev
114009d972
Cleans up some unused code
2017-09-29 15:59:12 -05:00
Ashe Higgs
e575bd6685
(Ready) Clockwork Cult Rework: Proof-of-concept
2017-09-26 15:22:09 -05:00
CitadelStationBot
eb36f34267
[MIRROR] Specifies one format of variable declaration for the codebase. ( #2895 )
...
* Specifies one format of variable declaration for the codebase.
* dumb mirroring
2017-09-22 23:35:36 -05:00
