Commit Graph

7077 Commits

Author SHA1 Message Date
Crazy Lemon
2a0733a008 Merge pull request #9151 from Fox-McCloud/pistol-change-loot
Stechkin Maintenance Pistol Change
2018-07-06 18:12:29 -07:00
tigercat2000
fcdb0fe54b Merge pull request #9172 from Fox-McCloud/no-lances
Removes Explosive Lances
2018-07-06 15:01:07 -07:00
tigercat2000
9697bd082f Merge pull request #9171 from Citinited/jon-is-no-longer-custom
Fixes spelling error
2018-07-03 15:47:57 -07:00
Fox McCloud
319a6cd500 Removes Explosive Lances 2018-07-03 18:13:51 -04:00
Citinited
a7dc1d70e9 Fixes speling error 2018-07-03 16:30:30 +01:00
alexkar598
a15ae140f2 Signs are pointing me that there will be a clone arm-oh wait...the signs were just exploited by the clown and duplicated 2018-07-02 15:15:58 -04:00
Fox McCloud
6c9f83f685 Stechkin Maintenance Pistol Change 2018-06-30 19:24:56 -04:00
Superhats
a186a85c62 Update chairs.dm 2018-06-21 18:24:50 +02:00
Superhats
756fecc1f3 Update chairs.dm 2018-06-21 18:07:07 +02:00
MINIMAN10000
868167d84c Fix cardboard drop count 2018-06-19 13:38:02 -07:00
Fox McCloud
8dcc35edd5 Fixes Home-Run Bat Charge 2018-06-18 16:48:12 -04:00
Kyep
412341439a Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)
* Fixes #8954

* projectile reagetns

* removes all attack logs on keyless simple_animals even by keyed mobs

* deletes 'potentially'

* Tiger request

* more comprehensive solution

* check for mob

* istype

* brevity

* Split attack logs preference

* toggle

* deletes old CHAT_ATTACKLOGS

* explains what levels do when toggling them

* clarification

* Tigercat requests
2018-06-13 16:55:21 -07:00
tigercat2000
4e758344d3 Merge pull request #9050 from Fox-McCloud/weather-subsystem
Converts and Updates Weather Subsystem
2018-06-13 16:08:02 -07:00
Fox McCloud
124f1518ce Merge remote-tracking branch 'upstream/master' into two-handed
# Conflicts:
#	code/game/objects/items/weapons/twohanded.dm
2018-06-13 17:29:37 -04:00
tigercat2000
32f7e22005 Merge pull request #9080 from Fox-McCloud/medbot-clean-up
Cleans Up Medibot Code, Re-Allows Syndicate Medibot
2018-06-13 13:57:05 -07:00
Fox McCloud
5fb13096a2 Merge remote-tracking branch 'upstream/master' into weather-subsystem
# Conflicts:
#	code/__DEFINES/layers.dm
2018-06-13 16:56:19 -04:00
tigercat2000
910d741382 Merge pull request #9043 from PigeonLord/paraboot
Added magboots in the Paramedic's EVA Gear closet
2018-06-13 13:29:39 -07:00
Fox McCloud
4531bc2337 tweaks 2018-06-03 19:26:48 -04:00
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
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
Fox McCloud
202fbe92fb Cleans Up Medbot Code, Re-Allows Syndicate Medbot 2018-05-29 12:15:04 -04:00
Ansari
ab3a96b1ec Add antag 2018-05-27 20:37:07 +08:00
Fox McCloud
ed9915edd9 Merge remote-tracking branch 'upstream/master' into two-handed
# Conflicts:
#	code/game/objects/items/weapons/twohanded.dm
2018-05-26 19:05:17 -04:00
Tayyyyyyy
bc977804de Small fixes 2018-05-25 18:39:38 -07:00
Tayyyyyyy
919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -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
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
ea44afdebe Merge pull request #9025 from Anasari/BombToInvestigate
Move bombing list to investigate & improve bomb logging
2018-05-25 17:58:13 -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
6cdfe70303 Converts and Updates Weather Subsystem 2018-05-21 00:01:18 -04:00
Piccione
812be3a0ec Added magboots in the Paramedic's EVA Gear closet 2018-05-20 10:59:02 +02: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
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
Fox McCloud
224b18af1c Merge remote-tracking branch 'upstream/master' into attack-animation-improvements 2018-05-17 23:34:01 -04:00
tigercat2000
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
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
66ee8fa0b6 spelling 2018-05-14 21:47:23 -04:00
Crazy Lemon
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