e0a51903a1
Not yet implemented design security level requirements.
2020-04-24 00:51:04 +02:00
5a6a205b9d
Merge pull request #11868 from Arturlang/tackling_and_lunge
...
Ports TG Tackling and uses it to rework bloodsucker lunge
2020-04-21 15:50:44 +02:00
d75e3f79bd
Merge pull request #11917 from Ghommie/Ghommie-cit688
...
Makes warm donk pockets cooling after 7 minutes canon again.
2020-04-19 16:52:33 +00:00
2039fb80e6
Update fancy.dm
2020-04-18 22:37:05 -04:00
8d4a67fedc
Makes warm donk pockets cooling after 7 minutes canon again.
2020-04-18 15:40:18 +02:00
7756682362
Merge pull request #11774 from Trilbyspaceclone/tools_andstuff
...
More mapping Loot tables and code improvements + Maints/Locker loot changes
2020-04-17 05:51:26 -07:00
2134515d5c
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
2020-04-15 12:19:37 +03:00
f828f4c4b7
Merge remote-tracking branch 'forrest/wewlad' into tos-compliance
2020-04-14 17:33:47 -05:00
e7247c6a60
Update wallets.dm
2020-04-14 10:11:37 -04:00
5833ed8029
Merge branch 'master' into tools_andstuff
2020-04-14 10:10:32 -04:00
05a954f000
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
2020-04-13 02:01:01 +02:00
0a54f8a7a0
I'M SORRY MR GITHUB PLS DONT BEAT ME
2020-04-09 17:27:18 -05:00
fe755a1424
Tackling Working so far, working on the lunge now
2020-04-09 21:42:00 +03:00
7c1e5aa2c9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
2020-04-09 15:46:19 +02:00
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
1f51e73dd6
more rng
2020-04-07 08:43:18 -04: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
c3faf94d8f
WIP
2020-03-30 05:29:39 +02: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
2b4b626fac
support for items that switch states through update_icon.
2020-03-10 16:55:30 +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
Ghommie