Anasari
e598cc46bf
Merge remote-tracking branch 'origin/master' into TGRefundPort
2018-06-19 07:46:31 +08:00
Fox McCloud
8dcc35edd5
Fixes Home-Run Bat Charge
2018-06-18 16:48:12 -04:00
Kyep
9660aac6d2
fix docs, change timing
2018-06-17 21:39:17 -07:00
Kyep
5e6407e3f8
Merge remote-tracking branch 'ParadiseSS13/master' into depot
2018-06-13 23:42:36 -07:00
Kyep and tigercat2000
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 and GitHub
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 and GitHub
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
Anasari
b6272b50fc
Changes the code to work more flexibly
2018-06-13 13:41:27 +08:00
Kyep
4d4eb16a3a
fixes merge conflict
2018-06-06 16:32:31 -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
Citinited
2a310f3539
Renames a bunch of variables; prevents possible exploit
2018-06-02 08:52:31 +01: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
Citinited
d978472d27
RPD nanoUI improvement; misc. code tweaks
2018-05-31 22:44:10 +01:00
Citinited
14ba039d81
GLOB
2018-05-30 21:47:03 +01:00
Citinited
2ec3c797fd
RPD refactor: part 2
2018-05-30 21:47:03 +01:00
Citinited
ce42a6d952
RPD refactor
...
Adds rpd_act proc to do stuff instead of doing it all in one big
afterattack proc
Removes RPD_ALLOWED_HERE flag as it is now redundant
2018-05-30 21:47:02 +01: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
FalseIncarnate
9af6eb086f
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into kitchen
2018-05-25 22:42:41 -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 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
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
Ansari
964777f8e2
Port over Fox's refactored TG refund from TG.
2018-05-23 13:55:13 +08:00
Fox McCloud
6cdfe70303
Converts and Updates Weather Subsystem
2018-05-21 00:01:18 -04:00
Ansari
25dd0feda2
Use !E.brutedam instead of == 0
2018-05-21 08:02:36 +08:00
Ansari
1cc1e30c54
Woot, refactored code. Added "healverb"
2018-05-21 08:01:57 +08:00
Ansari
43cefbcf71
No longer discriminates against the lower body
2018-05-20 20:51:52 +08:00
Ansari
ca1784d394
Fixes missing message for burn kit
2018-05-20 20:05:22 +08:00
Ansari
657d6fe275
Leftover healing is now split onto logical limbs
2018-05-20 19:40:52 +08:00
Fox McCloud
f328db7b2a
Refactors Camera Damage and Disabling
2018-05-20 05:45:07 -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
tigercat2000 and GitHub
1cfc3f27c8
Merge pull request #8974 from Fox-McCloud/holo-projector
...
Ports Holoprojectors
2018-05-17 20:19:13 -07: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 and GitHub
63ec546a0a
Merge pull request #9008 from Fox-McCloud/remove-mode
...
Removes All Modes
2018-05-14 17:49:58 -07:00
Anasari