Commit Graph

14643 Commits

Author SHA1 Message Date
Ghommie
a84e7bcecc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-24 04:00:51 +02:00
kevinz000
e9068f05eb let's play the optimization game featuring lighting (#12310)
* debug proc

* kinda quirky

* let's play the lighting game

* let's play the macro game

* let's play the refactor game

* let's play the optimization game

* let's play the optimization game x2

* yeehaw

* e

* let's play the memory game

* fix

* lighting fix

* sanitization and checks

* mh

* hotkeys fix

* ok
2020-05-23 22:47:42 +02:00
Lin
a6d7170d5b Merge pull request #12313 from kevinz000/click_logs
[s]click logging
2020-05-23 20:21:45 +00:00
Lin
c857dc9cd1 Merge pull request #12321 from Ghommie/Ghommie-cit779
Makes fermichem properly logged in the reagents logs, tiny astrogen fix.
2020-05-22 21:36:00 +00:00
Ghom
bcd911070a Fixing dwarfism. (#12331)
* Update body.dm

* Update dwarves.dm
2020-05-21 12:38:42 -07:00
Lin
4ee5d0cb37 Merge pull request #12296 from kevinz000/paracoat
Adds a paramedic wintercoat
2020-05-21 19:26:31 +00:00
Arturlang
8dd4fd4e66 Actually fixes mesmerize (#12330) 2020-05-21 21:26:05 +02:00
Lin
8ca1bcd237 Merge pull request #12315 from DeltaFire15/styp-silsulf-OD-fix
Fixes Styptic Powder & SilverSulf OD effects
2020-05-21 19:22:28 +00:00
Ghom
8a0ed38a58 Fixing a few issues with the nutrition adjustment proc and the circuit printer. (#12320) 2020-05-21 10:10:59 -07:00
kevinz000
e792600115 Update movement.dm (#12327) 2020-05-21 15:00:21 +02:00
Funce
0fbbd51418 Add the pie-cannon sound to the circuit version of the pneumatic cannon (#12319) 2020-05-21 14:55:25 +02:00
Trilbyspaceclone
fcb2b58664 Upgrade able Medical bot and Floor bot as well! + Clean bot fix! (#12112)
* Misstake are now

* Still dosnt all work

* no more range upgrade it just dosnt work

* bithell

* a this
2020-05-20 19:03:20 -07:00
Trilbyspaceclone
7337993d8e Lavaland Gear Tweaks - Armor balancing (#12270)
* lava land tweaks

* Reverts Exo suit touches

5% isnt worth that much, so might as well give it back

* Update miscellaneous.dm

* Reverts the ERT based gear
2020-05-20 18:47:30 -07:00
Ghom
3ac61c0704 Porting tg painting code. (#12305)
* Porting tg painting code.

* yes.
2020-05-20 18:45:36 -07:00
Ghom
6696560656 slendermen fix. (#12303)
* slendermen fix.

* Whops

* Update dwarfism.dm
2020-05-20 18:43:14 -07:00
Ghom
7f38e0714b Skill calculation fixes, tweaks, antag and brain damage modifiers. (#12302)
* Skill calculation fixes, tweaks, antag and brain damage modifiers.

* Experience through patience.

* Priority Fix etcetera.
2020-05-20 18:42:58 -07:00
Kraseo
a7053a978f Ports a tail from the RP server (#12301)
* tailse

* forgot to reorder it lol

* and i guess felinids and anthros can use it too
2020-05-20 18:37:38 -07:00
Ghommie
50171db408 Makes fermichem properly logged in the reagents logs, tiny astrogen fix. 2020-05-21 03:04:26 +02:00
kevinz000
dfcbee5045 Update pandemic.dm (#12318) 2020-05-21 02:34:09 +02:00
kevinz000
b57e1c1e93 Rebindable Hotkeys (#12138)
* demodularize interface

* keybindings

* binds

* prefs

* loose ends

* globals

* changes

* s

* datum ref lists

* ok

* fixes

* fixes

* fix

* ok

* sigh

* sigh

* indicators

* let's play the move code around game

* let's play the i didn't comma my lists game

* let's play the indent game

* let's play hte spelling bee

* let's fail the spelling bee

* LET'S PLAY THe HOW HARd  IS  IT TO SPELL A PROC GAME

* let's play the bugfix game

* bugfixes

* improvements

* Update bindings_client.dm

* pixel shift

* A

* wups
2020-05-20 23:40:20 +02:00
ArbyTheDragon
f73f5211f9 fixed converters.dm (#12316) 2020-05-20 23:38:15 +02:00
DeltaFire
761d014f6f fixes silver sulf and styptic OD effects
:)
2020-05-20 18:52:20 +02:00
kevinz000
89a14a82f0 ok 2020-05-20 07:46:58 -07:00
Ghom
ed90c59d65 Removal of """silk""" (#12221)
* Removal of """silk"""

* AAA

* Ashwalkers now start with durathread seeds
2020-05-19 23:43:46 -07:00
BlackMajor
fc921289d6 Merge pull request #12149 from kevinz000/DMAPI5
Updates DMAPI to v5
2020-05-19 22:32:17 +12:00
Lin
fc77954be3 Merge pull request #12290 from Ghommie/Ghommie-cit767
Certain cargo packs (mostly armory/security) can not be privately purchased anymore.
2020-05-19 05:15:12 +00:00
Ghom
4c3dac467f Mining inquisitor/berserker hardsuit nerf, slight drake armor buff. (#12289)
* Mining inquisitor/berserker hardsuit nerf, slight drake armor buff.

* Pretty unlikely you'll be hit by more than a handful spells in a single round.

* aaaa

* Update miscellaneous.dm
2020-05-18 16:55:40 -07:00
DeltaFire15
30f296b2c7 Clockies now can summon shields to bash nonbelievers into orbit. (#12252)
* Shield time

Adds a shield for clockies which empowers bashes via the damage it blocks. Might or might not compile yet. Icons going to be added in the next commit because I'd rather not have to revert all instead of just the icons if I do a fucky

* Icon time

Adds the icons for the clockie shield. Just the implementation + icons as of now, no way to get it. Might still not compile 😳

* Compilation issue resolution

Now it compiles. So it works. Maybe.

* Little change

Only harm-intent bashes amplify the bash / use energy.

* Fixes up shield.dms repeair proc and moves the brass shield repair there

Oh cool time to throw in a fix aswell, neat!

* Some tweaks

Buffs the shields armor and integrity since it was VERY easy to break with energy before, now its medium against those and very strong against ballistics. also a bit easier to accumulate charge because its ''only'' 50% block

* Some more stuff for the shield

Adds a spell to summon the shield (20dc time, 600kw cost, tier-two spell)
aswell as adding some ''fun'' for non-clockie users of the shield.

* typo man bad

* more spellchecking

* even more little tweaks

* clarification on a comment

* sound tweak

only plays a special sound if its an empowered bash

* final tweakies before PR

* Abuse safeguard

Yeeah might be best to not allow clockies to bash eachother for infinite charge.

* another typo fix

I really shouldn't have been coding stuff for this at 5 am...

* Safeguards for a VERY specific edge case

Would have caused some weird behavious for edge cases if not resetting the values, so I'm doing it to be sure.

* 5am code bad

same thing like the previous commit but not unreachable because of return statements.

* Applying requested changes / suggestions proposed by Ghommie

Early return statement done by the harmful / servant check, other returns / simillar done via . = ..()

* Formatting
2020-05-18 14:47:44 +02:00
Ghom
f624ce5fd4 Update species.dm (#12295) 2020-05-18 04:49:42 -07:00
Ghom
08392c7ae7 Fixing horns/wings colors not being loaded, and another couple misc issues. (#12287)
* Fixing horns/wings colors not saving up and another couple misc issues.

* Typos.

* accidental paste
2020-05-18 04:47:19 -07:00
Ghom
9eccef2836 Porting "Personal interaction messages to simple animals" and more. (#12268)
* Porting "Personal interaction messages to simple animals" and more.

* Travis check.

* doc

* whoopsie.

* )
2020-05-18 04:46:57 -07:00
Ghom
75dec8ce2c Ports "Removes the absolute istype fest from footsteps" (#12259)
* Ports "Removes the absolute istype fest from footsteps"

* Update species.dm
2020-05-18 04:46:22 -07:00
Ghom
20ac2f26f4 Demodularizing the gear loadout code a little. (#12261) 2020-05-18 04:45:50 -07:00
Ghom
95249a4d79 Fixing some issues with floating movetype & co. (#12262) 2020-05-18 04:44:19 -07:00
kevinz000
810da1b7c8 changes 2020-05-18 04:41:10 -07:00
Ghommie
58432dd6be Thanks Trilby. 2020-05-18 03:21:02 +02:00
Ghommie
9dd8cd5e8b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit767 2020-05-18 03:15:54 +02:00
kevinz000
fd5c635840 adds a snowflakey-ish(??? maybe???) way to modify gun damage so we don't need more shot types for improvised shotguns (#12274)
* Update gun.dm

* Update _firing.dm

* Update code/modules/projectiles/ammunition/_firing.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-18 02:59:50 +02:00
kevinz000
ab93d80289 Reworks cryo knockout times (#12267)
* Update cryo.dm

* Update cryo.dm

* Update cryo.dm
2020-05-18 02:43:20 +02:00
lolman360
93b26a787e POCKET SAND (#12263)
* POCKET

* sAAAAAAAAAAAAAND

* compile

* fix 2

* eeeeeeeeeee
2020-05-17 17:08:21 -07:00
Ghom
08280a853e Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers' (#12282)
* Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers'

* Ok, signals.
2020-05-17 17:04:15 -07:00
Ghom
335f5a37b9 Plane adjustments on several low layer objects. (#12286) 2020-05-17 17:02:57 -07:00
Ghom
d8d59e5052 Fixing old and new issues alike. (#12281) 2020-05-17 16:47:53 -07:00
Ghom
12ac08d7c5 Porting tesla/electrocute code updates. (#12280)
* Porting tesla/electrocute code updates.

* Why is the dominator being insta-deleted by zaps a good idea?

* Yikes.

* ah
2020-05-17 16:35:17 -07:00
Trilbyspaceclone
fa8351ebd1 Update dinnerware.dm (#12276) 2020-05-18 00:13:26 +02:00
Ghommie
2eb3089ccb Certain packs (mostly armory/security) can not be privately bought anymore. 2020-05-17 23:38:26 +02:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Lin
658fd23feb Merge pull request #12216 from Citadel-Station-13/Ghommie-patch-1
fixing light tubes / bulb lighting overlays being masked by... lighting.
2020-05-16 23:45:44 +00:00
Trilbyspaceclone
2e1cc498a3 corrects WT-550 ammo to state 32 rather then 20 (#12275) 2020-05-17 01:05:24 +02:00
Trilbyspaceclone
a71c282dac Makes assistant hivelords less wired (#12256)
* Update hivelord.dm

* Update hivelord.dm

* Update hivelord.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-17 01:04:25 +02:00