Fox McCloud
7f2f766f70
Merge remote-tracking branch 'upstream/master' into attack-hulk
...
# Conflicts:
# code/game/objects/structures/window.dm
2018-06-03 18:49:44 -04:00
uraniummeltdown
75bded82cf
added defines for window construction states and full window diagonal dir
...
added a proc to check for valid window location, added var/fulltile to windows instead of using a proc
added clockwork windoors and windows to brass recipes
added titanium glass and plastitanium glass, made glass types use recipes like other stacks, you can smelt the new glasses in the ORM
removed force from RCD and added NOBLUDGEON flag, fixing a bug where you couldn't deconstruct airlocks with an RCD
slight nerf to wielded fireaxe, does high damage to windows and grilles instead of insta-deleting them
deleted fullwindow.dm and moved windows to window.dm
added some feedback to placing glass on grilles
examining windoor assembly shows you can rotate it, examining windows show deconstruction hints and rotation
added cracks to windows, you can repair windows using a welding tool on help intent, slight buff to window health
added var/cancolor to windows and blacklists some windows from being auto-colored, window shards also get colored on narsie_act()
full windows now use icon smoothing system, windows now use the obj_integrity damage system
added is_glass_sheet() helper
2018-06-03 13:11:37 +04:00
tigercat2000 and GitHub
49e49591a1
Merge pull request #9075 from Anasari/AttackLogImprove
...
Improved (ish) attack log logging
2018-06-01 20:52:42 -07:00
FalseIncarnate
18a0ff541e
Better solution
...
Repathed the point decal to the temp_visual effects path. This path has
built-in singularity resistance, and allows me to remove a spawn in
favor of a built-in QDEL_IN call
Also changed points from using the magic number 16 to POINT_LAYER for
their layer definition. This does technically drop the point by 4 layers
(POINT_LAYER is 12), placing them now below the light layer (shouldn't
affect anything) instead of just above it.
2018-05-30 21:55:26 -04:00
FalseIncarnate
496d4794ad
[s] Fixes #9073
...
The singulo no longer feeds on attention.
🆑
fix: The singulo no longer feeds on attention.
/🆑
2018-05-30 21:26:18 -04:00
Tayyyyyyy
def0702ba0
Fix incorrect ERT slots being set
2018-05-27 15:48:29 -07:00
Ansari
ab3a96b1ec
Add antag
2018-05-27 20:37:07 +08:00
tigercat2000 and GitHub
baf5fe64a7
Merge pull request #8967 from Tayyyyyyy/pronouns
...
Pronouns!
2018-05-25 19:39:11 -07:00
tigercat2000 and GitHub
a1d2261970
Merge pull request #9071 from Allfd/tos
...
Terms of service
2018-05-25 19:38:22 -07:00
Tayyyyyyy
f67c9aa15a
Fix changeling grammar
2018-05-25 18:39:38 -07:00
Tayyyyyyy
bc977804de
Small fixes
2018-05-25 18:39:38 -07:00
Tayyyyyyy
0ee6cde88e
Fix a few style issues
2018-05-25 18:39:38 -07:00
Tayyyyyyy
bcde39b9b1
Fix dethrall
2018-05-25 18:39:37 -07:00
Tayyyyyyy
919bd7aaf2
Replace \his, \he, \him, \himself
2018-05-25 18:39:37 -07:00
Tayyyyyyy
2b666145d5
Fix objective text
2018-05-25 18:34:28 -07:00
Tayyyyyyy
98c6ddf5a7
Fix his, he, him
2018-05-25 18:34:28 -07:00
Tayyyyyyy
aa9d658847
Them
2018-05-25 18:34:28 -07:00
Tayyyyyyy
330d607550
Leftover theys
2018-05-25 18:34:26 -07:00
Tayyyyyyy
ad23362781
Death
2018-05-25 18:34:24 -07:00
Tayyyyyyy
dd120a00f0
Their
2018-05-25 18:34:24 -07:00
Tayyyyyyy
c80704e724
Conjugating verbs is hard
2018-05-25 18:34:23 -07:00
Tayyyyyyy
170266d827
More pronouns
2018-05-25 18:34:23 -07:00
Tayyyyyyy
ad0da70305
Punches
2018-05-25 18:34:22 -07:00
Tayyyyyyy
497072d4d1
Update pronoun usage
2018-05-25 18:34:22 -07:00
tigercat2000 and GitHub
9ceda6f9a3
Merge pull request #9068 from Birdtalon/holololo
...
Small holoparasite update
2018-05-25 18:04:12 -07:00
tigercat2000 and GitHub
81eab7e378
Merge pull request #8990 from RyanSmake/poddoor
...
Poddoors, now with 14 times less commits
2018-05-25 18:00:21 -07:00
tigercat2000 and GitHub
ea44afdebe
Merge pull request #9025 from Anasari/BombToInvestigate
...
Move bombing list to investigate & improve bomb logging
2018-05-25 17:58:13 -07:00
tigercat2000 and GitHub
048b46323d
Merge pull request #9026 from Tayyyyyyy/ert_fallback_fix
...
Fix fallback amber team never working
2018-05-25 17:55:53 -07:00
tigercat2000 and GitHub
6a0b9df7ab
Merge pull request #9062 from Anasari/EMPJump
...
EMP logging improvement
2018-05-25 17:45:59 -07:00
Alffd
61d746e009
Tiger changes
2018-05-25 15:51:03 -04:00
Alffd
ef1b44b955
Terms of service click through.
2018-05-25 03:40:16 -04:00
Birdtalon
e27d7edcf4
updates holoparasite guide, small QoL toolip for charger holoparasite playstyle string
2018-05-23 22:09:52 +01:00
Tayyyyyyy
a87ac6ac8a
Fix invalid feed channels and wanted stories
2018-05-23 04:07:29 -07:00
Ansari
827503b0a4
EMP now provide coordinates and allow you to jump to it. Most EMP instance except for the Experimentor and the Singularity are now logged.
2018-05-23 18:33:12 +08:00
Fox McCloud
79889f3e3e
foam conversion
2018-05-19 19:55:29 -04:00
Fox McCloud
fc7692cdce
alien object damage system
2018-05-19 03:26:10 -04:00
Fox McCloud
a87170255b
Makes Hulk Attacking Less Snowflakey
2018-05-19 02:32:34 -04:00
Crazy Lemon and GitHub
689801a15c
Merge pull request #9029 from Fox-McCloud/attack-animation-improvements
...
Further Improves Attack Animations
2018-05-18 20:33:14 -07:00
Ansari
10f38f7a7e
I missed syndicatebomb. Also added investigate to priming it.
2018-05-18 12:33:14 +08:00
Ansari
dd417c006b
Uses define instead of "bombs" for styling reason. Fixes IED not logging into investigate due to its special mechanism.
2018-05-18 12:23:08 +08:00
tigercat2000 and GitHub
6bbf2920b9
Merge pull request #9020 from Fox-McCloud/preps-the-way
...
Preps the Way for Datumized Antags
2018-05-17 20:34:12 -07:00
Fox McCloud
224b18af1c
Merge remote-tracking branch 'upstream/master' into attack-animation-improvements
2018-05-17 23:34:01 -04:00
tigercat2000 and GitHub
1cfc3f27c8
Merge pull request #8974 from Fox-McCloud/holo-projector
...
Ports Holoprojectors
2018-05-17 20:19:13 -07:00
Fox McCloud
c0d5655f4d
Further Improves Attack Animations
2018-05-17 19:48:03 -04:00
Ansari
792f3ada27
Fixes spacing
2018-05-18 07:05:05 +08:00
Tayyyyyyy
a43c353fef
Fix fallback amber team never working
2018-05-17 11:40:04 -07:00
Ansari
2e870f8038
Remove all instance of bombers. Replace "bomber list" in secrets with "bombs" in investigate. Remove useless clear bomb function.
2018-05-17 23:14:29 +08:00
Fox McCloud
5df7dfdaac
Preps the Way for Datumized Antags
2018-05-15 21:55:44 -04:00
Crazy Lemon and GitHub
3e4dbaf9c1
Merge pull request #9014 from Fox-McCloud/remove-dem-oldies
...
Removes A Bunch of Old, Unused Files
2018-05-14 17:55:12 -07:00
Crazy Lemon and GitHub
63ec546a0a
Merge pull request #9008 from Fox-McCloud/remove-mode
...
Removes All Modes
2018-05-14 17:49:58 -07:00
Fox McCloud