22bf4cdb83
Merge pull request #11760 from Trilbyspaceclone/10mmchanges
...
Stechkin and ASP ammo boxes in uplink and ASP ammo boxes
2020-04-09 02:38:44 -07:00
8379169b81
Merge pull request #11476 from kevinz000/shield_refactor
...
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
2020-04-07 20:47:15 +00:00
cb1e6b518d
forgot to save last commit that fixes this
2020-04-06 08:50:37 -04:00
2cd59a6fb0
that was easy
2020-04-06 08:40:34 -04:00
41e2c60d4a
Ports "Makes raw HTML and browser datum popups UTF-8 aware"
2020-03-27 22:52:43 +01:00
62d1a1f734
cook now gets to choose their ingredient box + sushi ingredient box ( #11590 )
...
* Update miscellaneous.dm
* Update cook.dm
* fixes some bugs
* i broke something again and now fix it
* fixes remote, edits ingredient box contents
* even more wildcard items
who doesn't love eggs, grapes and various kinds of human meat? (skeleton meat is a thing for some reason, and thus it goes. IN THE LIST.)
* removes a random newline
* adds a newline to the end of the file i accidentally removed
* why was there a newline here too
2020-03-24 20:39:46 +01:00
bf0970d8c3
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-23 15:34:04 -07:00
ea7c1058b5
Merge pull request #11524 from Ghommie/Ghommie-cit627
...
More or less ports "Clothing /under repath"
2020-03-23 10:40:31 -07:00
33317e20fe
Merge pull request #11570 from zeroisthebiggay/contractorrandomitemspowergaming
...
moves sneaksuit to bundles, removes useless contractor items, adds sneaksuit to contractor pool of random items
2020-03-23 10:38:22 -07:00
3c2cb76792
Fixing owner not being set in mutation/on_aquiring.
2020-03-22 15:23:05 +01:00
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
46d80cd784
i forgot a comma
2020-03-21 20:18:44 -04:00
a5f988e0be
fuck me up fam
2020-03-21 19:43:43 -04:00
300c8e3c6d
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-21 09:53:39 -07:00
94c700a06c
NVG Nerf/Syndicate NVG Buff ( #11548 )
...
* nerfs the shit out of nvg and gives syndicate special flashproof versions
* forgot about this one
* bleh
2020-03-21 15:31:59 +01:00
93b1ade0bc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into uplinkclothinggetssuckies
...
# Conflicts:
# code/modules/uplink/uplink_items/uplink_badass.dm
2020-03-21 02:17:13 -04:00
6754b794b1
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-20 22:59:17 -07:00
570f6e8a66
Plastitanium Rapier: Sleepy Edition ( #11507 )
...
* knockout rapier, improved sprites
* it's a rapier not a foil those aren't synonyms
* whoops
* needs it's shanking sound
* Put a stamina loss threshold onto the swords slep so you need at least two hits to proc the sleep. Don't get stabbed more than once!
* Update items_and_weapons.dmi
* Removes chat spam and also frankly it doesn't need drowzy on top
2020-03-20 16:07:04 +01:00
35a4d71a54
im sorry little one
2020-03-19 21:59:14 -04:00
9bd275e430
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-16 13:47:53 -07:00
8fdb1e5964
Merge pull request #11465 from Seris02/duffelbagholding
...
duffel bags of holding
2020-03-16 06:12:40 -07:00
b8e8a81d1c
there
2020-03-16 20:49:10 +08:00
6af9c54da5
better
2020-03-16 04:59:55 -07:00
2a9e4bebdd
priority
2020-03-16 04:24:18 -07:00
d32bff7815
return list
2020-03-16 03:35:10 -07:00
703fca5f90
add owner argument
2020-03-16 03:24:19 -07:00
4d0677daa9
s
2020-03-14 21:48:23 -07:00
5a04b43db4
duffel baaaaaaaaaaags
2020-03-14 16:12:17 +08:00
0ca58b5ed8
why though
2020-03-13 04:19:20 +00:00
480eb32c68
Merge pull request #11418 from Ghommie/Ghommie-cit615
...
Fix runtimes some more.
2020-03-11 17:01:13 -07:00
27a7f754c4
Fix runtimes some more.
2020-03-10 22:40:06 +01:00
832d894e92
Merge pull request #11388 from Owai-Seek/crabby-patty-3/1/20
...
Food Ports / Butter Bear / Food Craft Speed
2020-03-10 05:59:24 -07:00
1c5aa2f933
Merge pull request #11377 from Kraseo/contractor-fixes
...
Some contractor adjustments & fixes
2020-03-09 00:26:54 +01:00
bb9066e9cb
Food Additions / Butter Bear
...
Ports the following from TG:
Chicken Nugget Box
Crab Burger, Bisque, French Onion Soup, Crab Rangoo
Butter Bear aka Terrygold
Tweaks Bisque and Crab Rangoo recipie.
Removes Bacon from Exotic Meat crate.
Adds Spider Eggs to Exotic Meat crate.
2020-03-08 14:36:08 -04:00
5bcb38c79f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit610
2020-03-08 02:33:27 +01:00
bbf43b0464
whoopsies almost forgot this
2020-03-07 20:48:04 +01:00
7bed0d5c87
Of runtimes and null.
2020-03-07 01:57:15 +01:00
ad20fb1a0e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
2020-03-06 11:58:11 +01:00
2e35c09dec
Merge pull request #10451 from kevinz000/mobility_flags
...
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
2020-03-05 20:03:56 -05:00
8b0b685fa7
CHECK_MOBILITY
2020-03-03 20:40:33 -07:00
1e99cd0bfe
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
e3c77f2f5a
part 4: the one where i slowly go insane
2020-03-01 22:05:35 +01:00
ab48a6fa16
part 3: do people even read commit logs
2020-03-01 19:14:05 +01:00
d93ade7e03
part 2: bloody tendency
2020-03-01 17:37:18 +01:00
38f7821dd6
part 1: battle stream
2020-03-01 16:56:13 +01:00
d5c2c54f32
Update fancy.dm
2020-02-28 19:14:58 +01:00
56eab760fc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-27 20:11:36 -07:00
b5f472c6dd
thank you dreamchecker
2020-02-27 01:47:18 +01:00
fc76cd9a9b
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
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
kevinz000