6b9fc7eccf
Merge pull request #12169 from Ghommie/Ghommie-cit734
...
Porting some radial menu updates, and that one clown mask skin.
2020-05-10 14:14:19 -07:00
e1d113b970
Config for antag forcing ( #12171 )
2020-05-10 21:35:20 +02:00
c2e689aec0
i'm salty ( #12181 )
2020-05-10 21:33:56 +02:00
dd7db603d2
Merge pull request #12159 from Ghommie/Ghommie-cit732
...
'mob_run_block' and 'mob_check_block' macros
2020-05-10 18:25:16 +00:00
05cede4e4d
fixes xenomorphs not being in combat mode ( #12193 )
...
* ok
* Update combat.dm
2020-05-10 17:38:07 +02:00
e7fedd7d12
Merge pull request #12148 from Trilbyspaceclone/patch-369
...
Adds Ice hiking boots to miner venders
2020-05-10 05:36:38 +00:00
f7808e97ad
fix ( #12188 )
2020-05-10 02:58:58 +02:00
b131c0e679
Merge pull request #12186 from Trilbyspaceclone/patch-372
...
Fixes firealarm icon states
2020-05-09 16:47:20 -07:00
374ffaa70d
Merge pull request #12172 from KathrinBailey/Kat-Furniture
...
Sprite Improvements: Padded Floor & Chess Pieces
2020-05-09 16:46:54 -07:00
0c630be04d
Add files via upload
2020-05-09 19:16:33 -04:00
2c5819d5fe
Delete monitors.dmi
2020-05-09 19:14:50 -04:00
a6ad4dc9bf
changeling rebalance. ( #12134 )
...
* Update fleshmend.dm
* Update shriek.dm
* Update mutations.dm
* makes aug-eyes into actual thermals.
* removing regen jelly and mannitol from adrenals
* Update strained_muscles.dm
* Update chameleon_skin.dm
* Update biodegrade.dm
* Update fleshmend.dm
whoops, forgot to add the loudness text.
* Update fleshmend.dm
why do i keep doing this.
* holy shit i'm tired.
* Update code/modules/antagonists/changeling/powers/augmented_eyesight.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update augmented_eyesight.dm
* Update augmented_eyesight.dm
* Update augmented_eyesight.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-05-09 14:38:18 +02:00
c20c7f0698
Removes crocin, hexacrocin from emagged booze dispenser; makes crocin no longer "roofies" (??) ( #12177 )
...
* Removes crocin, hexacrocin from emagged booze dispenser
* what. what. what. what. what.
2020-05-09 14:34:30 +02:00
fd09bcf698
Fixes stacking multiple bear traps in one tile ( #12168 )
...
* Automatic changelog compile [ci skip]
* Automatic changelog compile [ci skip]
* no more deathstacks i guess
* that'll do piggy
* or not
* h elp
* ok this should do it for real this time
Co-authored-by: Changelogs <action@github.com >
2020-05-09 14:25:31 +02:00
cdfdaac82e
ok ( #12161 )
2020-05-09 14:21:27 +02:00
1981b6b3c7
Merge pull request #12130 from Ghommie/Ghommie-cit727
...
Dims the lights, again.
2020-05-08 23:30:19 -07:00
dcdda5451e
Merge pull request #12146 from Trilbyspaceclone/patch-368
...
slows down ice demons
2020-05-08 23:29:50 -07:00
5a716bfcfd
Merge pull request #12143 from Ghommie/Ghommie-cit729
...
Demodularizing a few sprite assets.
2020-05-08 23:29:34 -07:00
cfcac55654
Merge pull request #12142 from Ghommie/Ghommie-cit728
...
Demodularizing the arousal module.
2020-05-08 23:29:16 -07:00
c435c6b6a8
Merge pull request #12158 from Trilbyspaceclone/helper-text
...
What if mechs give more information?
2020-05-08 23:29:01 -07:00
712b278a8e
Merge pull request #12156 from Citadel-Station-13/Ghommie-patch-3
...
Fixing a whoopsie with args in some skill proccalls.
2020-05-08 23:28:45 -07:00
c92eaf805a
Merge pull request #12153 from Citadel-Station-13/Ghommie-patch-1
...
Quick webedit fixing thousand stack_trace reports.
2020-05-08 23:28:06 -07:00
1be722d53f
Merge pull request #12163 from Citadel-Station-13/Ghommie-patch-5
...
Fixing rechargers not putting the item in hands
2020-05-08 23:27:37 -07:00
75bcebde36
Merge pull request #12162 from Citadel-Station-13/Ghommie-patch-4
...
Quick PR fixing fireman carry.
2020-05-08 23:27:25 -07:00
9816b270ec
Padded Floor & Chess Pieces
...
Sprites improved. A black 50 alpha border was added to the chess pieces. The king pieces were shortened by 1 pixel to let the black border wrap around. This helps the white pieces stand out on bright tiles.
Padded floor now has the centre cushion bit on all corners. This design is similar to other tiles in SS13, so this should hopefully make the sprite fit into a TG codebase more.
2020-05-09 04:55:28 +01:00
d309bc5e74
Instruments no longer keep updating if you aren't holding them etc etc ( #12165 )
...
* Update _song.dm
* Update item.dm
2020-05-09 03:15:42 +02:00
2a9746b34a
Pubby atmos opening up ( #12117 )
...
* First update, atmos control room
* finalization
* Final bugfixes
* final update
2020-05-09 02:55:07 +02:00
6067370a6f
shotgun shell clips ( #11955 )
...
* shell clips revised by based ghom
* lmao yeet better not forget that bit
* nitpicking but also merge 11976 first
* No freeloaders.
* Update weapon_designs.dm
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com >
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-05-09 02:49:25 +02:00
381333bf82
a ( #11873 )
2020-05-09 02:15:41 +02:00
cab55f8549
alternate buff ( #11867 )
2020-05-09 02:14:18 +02:00
4c26beba38
ah
2020-05-09 01:50:24 +02:00
3531459d8b
Some trauma rebalancing ( #12144 )
...
* Some trauma rebalancing.
* Wow I didn't actually commit the 50% change
* when did i stop compiling before pushing
2020-05-09 01:42:39 +02:00
3a8e9da73b
Fixes projectiles going sanic ( #12167 )
...
* ok
* woops
2020-05-09 01:27:26 +02:00
364ca3fdf2
There is more!
2020-05-09 01:14:29 +02:00
88d86e53d0
Porting some radial menu updates, and that one clown mask.
2020-05-09 00:45:48 +02:00
2d9aac8f31
cakehat cat wearing a cakehat while patting a cak ( #12166 )
...
fix
2020-05-09 00:40:07 +02:00
ab8342d453
Merge pull request #12141 from Trilbyspaceclone/patch-367
...
Corrects medical packet crafting
2020-05-08 21:27:43 +00:00
97c5eb9b8f
Fixing chargers not putting the item in hands
2020-05-08 22:20:54 +02:00
2650df11d5
Update riding.dm
2020-05-08 22:12:27 +02:00
43f6acd81b
*crys*
2020-05-08 15:42:35 -04:00
a711f312ce
Update mecha_construction_paths.dm
2020-05-08 15:37:17 -04:00
c9f8f55945
Update mecha_construction_paths.dm
2020-05-08 15:29:20 -04:00
e0d56363d4
Update mecha_construction_paths.dm
2020-05-08 15:13:13 -04:00
5ab1d04154
Update mecha_construction_paths.dm
2020-05-08 14:44:27 -04:00
9caa236e85
Update mecha_construction_paths.dm
2020-05-08 14:22:15 -04:00
ffd5dd9615
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit732
2020-05-08 19:01:28 +02:00
a412e840f7
'mob_run_block' and 'mob_check_block' macros
2020-05-08 18:52:32 +02:00
47319cc8c9
What if mechs give more information?
2020-05-08 11:28:39 -04:00
73d958649e
Update item_attack.dm
2020-05-08 17:12:13 +02:00
7616887604
Update mood.dm
2020-05-08 16:13:57 +02:00
kevinz000