ancientpower
|
f44908dc2e
|
forgot icon state changes
|
2020-02-29 02:03:25 -06:00 |
|
ancientpower
|
5c5ec541ae
|
Merge branch 'master' into paramedic-tweaks
|
2020-02-29 01:55:46 -06:00 |
|
ancientpower
|
f48e56fe44
|
thanks mapdiffbot
|
2020-02-29 01:49:42 -06:00 |
|
ancientpower
|
c4113824f7
|
more fixes
|
2020-02-29 01:47:19 -06:00 |
|
Lin
|
70e2563579
|
Merge pull request #11266 from Ghommie/Ghommie-cit593
Fixing another couple mob holder oversights.
|
2020-02-29 00:13:58 -06:00 |
|
Lin
|
5ba6320f5e
|
Merge pull request #11261 from Ghommie/Ghommie-cit591
Fixing escaped characters in flavor texts.
|
2020-02-29 00:12:35 -06:00 |
|
Lin
|
a3eef43445
|
Merge pull request #11263 from Citadel-Station-13/Ghommie-patch-3
Removes extra unwarranted paramedic access.
|
2020-02-29 00:11:16 -06:00 |
|
kevinz000
|
c5edeb9913
|
Merge pull request #11265 from Citadel-Station-13/Ghommie-patch-4
Cogchamp mixing sound made less annoyingly long.
|
2020-02-28 12:41:05 -07:00 |
|
ancientpower
|
ed320046c5
|
fixes icons
|
2020-02-28 11:42:15 -06:00 |
|
kevinz000
|
e39d7fa49d
|
Merge pull request #11259 from Ghommie/Ghommie-cit590
Porting update_icon improvements.
|
2020-02-28 04:30:12 -07:00 |
|
kevinz000
|
d0eebdbb02
|
Merge pull request #11273 from Arturlang/blob_broacast_exploit
[s] Fixes blob broadcast HTML Injection.
|
2020-02-28 04:28:41 -07:00 |
|
Artur
|
c6fcffe949
|
Made the same mistake...
|
2020-02-28 13:19:27 +02:00 |
|
Artur
|
d6e402aa5d
|
Damned
|
2020-02-28 13:06:28 +02:00 |
|
ancientpower
|
23c3e5b328
|
tweaks for the tweaks
|
2020-02-28 00:17:28 -06:00 |
|
ancientpower
|
12ba71f588
|
paramedic tweaks
|
2020-02-27 23:23:44 -06:00 |
|
Ghommie
|
11f767d412
|
A couple mob holder oversights. Again?
|
2020-02-27 16:16:21 +01:00 |
|
Ghom
|
eb3f985434
|
Update drinks_recipes.dm
|
2020-02-27 14:16:39 +01:00 |
|
Ghom
|
d85563367e
|
Whoopsie
|
2020-02-27 12:39:01 +01:00 |
|
Ghom
|
bfe3bbb6d5
|
Update paramedic.dm
|
2020-02-27 12:34:13 +01:00 |
|
kevinz000
|
b854cb5980
|
Merge pull request #11262 from YakumoChen/LMAO-2CAT!!1
Adds 2cat, again
|
2020-02-27 01:22:25 -07:00 |
|
YakumoChen
|
f6c170d31b
|
Update tails.dm
|
2020-02-27 08:15:27 +00:00 |
|
YakumoChen
|
e682845ebf
|
Update tails.dm
|
2020-02-27 08:09:34 +00:00 |
|
kevinz000
|
b0018a246c
|
Merge pull request #11248 from Putnam3145/lick-pref
Made lick prefs actually save
|
2020-02-27 01:05:56 -07:00 |
|
YakumoChen
|
2cb95e200a
|
Update tails.dm
|
2020-02-27 08:04:32 +00:00 |
|
kevinz000
|
19962493a9
|
Merge pull request #11241 from Arturlang/Solar_updates
Ports TGs Solar updates.
|
2020-02-27 01:03:52 -07:00 |
|
YakumoChen
|
e0c7c98253
|
Update tails.dm
|
2020-02-27 08:01:13 +00:00 |
|
kevinz000
|
924c7e0d05
|
Merge pull request #11235 from Detective-Google/if-it-compiles-it-works
unfucks paramedics access + PDA
|
2020-02-27 01:00:45 -07:00 |
|
kevinz000
|
f00a2c1cd3
|
Merge pull request #11202 from Hatterhat/beegions-but-actual-bees
Beegions, But With Actual Bees
|
2020-02-27 00:59:57 -07:00 |
|
kevinz000
|
40c36213df
|
Merge pull request #11244 from Ghommie/Ghommie-cit589
Fixing virology cause someone didn't covert ALL mob/species biotypes to flags.
|
2020-02-27 00:57:54 -07:00 |
|
kevinz000
|
a8a8e242d8
|
Merge pull request #11219 from YakumoChen/LMAO-2CAT!!1
Adds 2cat (tail)
|
2020-02-27 00:54:47 -07:00 |
|
kevinz000
|
648e304ef8
|
Merge pull request #11240 from Trilbyspaceclone/patch-297
Raises blob point cap by 150 (aka they can store 250 now)
|
2020-02-27 00:53:10 -07:00 |
|
Ghommie
|
a91464bf64
|
Fixing escaped characters in flavor texts.
|
2020-02-27 02:29:44 +01:00 |
|
Ghommie
|
fc76cd9a9b
|
Porting update_icon improvements. Part 1.
|
2020-02-27 01:21:03 +01:00 |
|
Ghom
|
954f03f4e0
|
Merge pull request #11150 from raspyosu/master
Bloodsucker Abilities Tweaks/Rebalances
|
2020-02-27 00:54:41 +01:00 |
|
Artur
|
27b6469c67
|
Forgot a var
|
2020-02-26 16:42:38 +02:00 |
|
Putnam
|
c906f8f17f
|
lickable.
|
2020-02-25 20:49:01 -08:00 |
|
Putnam
|
0a698d1eeb
|
oy.
|
2020-02-25 20:07:07 -08:00 |
|
Ghommie
|
e02a6f6dea
|
Fixing virology cause someone didn't covert ALL mob/species biotypes to flags.
|
2020-02-25 15:37:02 +01:00 |
|
Ghom
|
56d5899bbc
|
Merge pull request #11236 from bunny232/master
Sentience event preference xenomorph to sentience potion
|
2020-02-25 15:19:28 +01:00 |
|
Artur
|
00403a39c6
|
Reverts tracker changes somewhat
|
2020-02-25 15:47:15 +02:00 |
|
Artur
|
f8469c89a4
|
Conflict fix
|
2020-02-25 10:46:20 +02:00 |
|
Trilbyspaceclone
|
2aeb1e1b4a
|
Update overmind.dm
|
2020-02-25 00:32:45 -05:00 |
|
Trilbyspaceclone
|
cf23018b6a
|
Update snacks_cake.dm
|
2020-02-24 22:51:43 -05:00 |
|
bunny232
|
53d5328c0c
|
Update sentience.dm
|
2020-02-24 18:49:34 -05:00 |
|
Detective Google
|
569ea6bd61
|
unfucks paramedics access + PDA
|
2020-02-24 16:36:45 -06:00 |
|
kevinz000
|
febb890c7f
|
Merge pull request #11192 from Putnam3145/supermatter-hardcap
Made supermatter power increase with raw damage
|
2020-02-24 15:12:45 -07:00 |
|
Ghom
|
f86e17d945
|
Merge pull request #11129 from Owai-Seek/movefood-2-16-20
Reorganize Food Recipes, "Balance" Tweaks
|
2020-02-24 20:53:36 +01:00 |
|
Ghom
|
9355e9319b
|
Merge pull request #11110 from Hatterhat/hyper-96-aus-unk
you kids like extend votes?
|
2020-02-24 16:39:16 +01:00 |
|
Artur
|
528a226dae
|
Done.
|
2020-02-24 13:36:55 +02:00 |
|
YakumoChen
|
6385445fd5
|
ruining the joke
|
2020-02-24 10:31:47 +00:00 |
|