5bc19fd8e3
math lmao
2020-05-09 09:08:14 -07:00
707ef069ef
why
2020-05-09 08:45:56 -07:00
4f68eacfaa
aa
2020-05-09 08:40:15 -07:00
824d967241
i love math
2020-05-09 08:26:54 -07:00
b30dd2c1f2
okay
2020-05-09 08:06:42 -07: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
a380e71872
a
2020-05-09 00:16:29 -07:00
407b1c7447
Merge remote-tracking branch 'citadel/master' into projectiles_2
2020-05-08 23:32:01 -07: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
a66aad9b70
compile
2020-05-08 23:03:44 -07:00
0f157204eb
compile
2020-05-08 23:02:41 -07:00
19072abe37
compile
2020-05-08 23:01:05 -07:00
6d6239a8b4
kay
2020-05-08 22:59:51 -07:00
9f25759aa8
Citsnow -> final name (Snaxi) , fixes arrivals
2020-05-09 00:53:04 -05:00
e684c6e574
ok
2020-05-08 22:40:07 -07:00
4cd5e08902
sigh
2020-05-08 21:27:36 -07: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
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
35566b5795
Merge remote-tracking branch 'upstream/master' into snaxi2
2020-05-08 18:21:57 -05: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
1872f556ac
woops
2020-05-08 15:09:02 -07:00
afa006d280
ok
2020-05-08 15:02:38 -07:00
ab8342d453
Merge pull request #12141 from Trilbyspaceclone/patch-367
...
Corrects medical packet crafting
2020-05-08 21:27:43 +00:00
2858ddd90b
Porting "Refactors language holder"
2020-05-08 22:44:02 +02: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
kevinz000