Xantholne
1c968e6ebe
period equals
2020-12-20 16:00:18 -07:00
Xantholne
a5c14b90c5
Adds missing sheathing sounds
2020-12-18 22:56:30 -07:00
Xantholne
d60d72c7b7
Fixes twin belts
...
gives item state and icon state to be functional
2020-12-18 22:03:24 -07:00
zerothebigboy
a8315a69e2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into crepe
...
# Conflicts:
# icons/mob/clothing/belt.dmi
# icons/obj/clothing/belts.dmi
2020-10-11 01:19:18 -04:00
zerothebigboy
ef073167df
crepe
2020-10-10 21:39:45 -04:00
The0bserver
98f398338a
belt fix and icons
2020-10-09 02:34:42 -04:00
The0bserver
0d1d94fd06
belt
2020-10-09 01:17:46 -04:00
lolman360
bc14155632
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
2020-08-23 17:01:45 +10:00
lolman360
1deafc7103
its asking me to commit hold on
2020-08-23 17:01:32 +10:00
lolman360
2a3ada511e
It's all codersprites?
...
Always has been.
2020-08-23 16:51:55 +10:00
lolman360
e00c383b1a
Update belt.dm
2020-08-18 20:19:54 +10:00
silicons
90d3cff53f
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-29 11:53:59 -07:00
silicons
e4148fe4ad
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-29 01:11:11 -07:00
silicons
9ff94e019b
Merge pull request #12924 from SiliconMain/analyzer
...
Ports long range atmos analyzer from skyrat
2020-07-29 01:09:48 -07:00
SiliconMain
abdafe15fa
fuck
2020-07-26 15:21:24 -05:00
SiliconMain
1a78098885
on second thought
2020-07-26 05:20:53 -05:00
SiliconMain
54ed22d17d
ye
2020-07-26 05:19:56 -05:00
SiliconMain
d1c3465d77
Update belt.dm
2020-07-26 04:28:18 -05:00
silicons
f3efa19436
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-21 11:25:26 -07:00
Timothy Teakettle
a4478b0cda
it continues
2020-07-17 22:38:28 +01:00
Keate Senior
6275b5ae97
Forgot the 'advanced' prefix here, since thats what it is, essentially
2020-07-15 00:07:57 -04:00
Keate Senior
80b4c03c82
Initial changes to get this to github for public reviewing
...
-Removes the Reebe z level and puts it on the cc z level
-Replaces the Neovgre mech stepsound
-Moves spacial gateway into drivers so the cult isn't stuck stationside
-Adds the Belligerant scripture, which applies the Belligerant status effect to non-clankers in range
-Various other changes currently commented out for later work on them.
-removes the abductor teleport cameras from Reebe
-adds a Brass multitool, essentially just an advanced multitool with a special sprite.
-makes clockcult armor have 0 laser defense normally and 10 defense when the ark is almost done summoning Ratvar instead of -25 --> -15
-Makes spear recalling worded to support the addition of new weapons to summon
-Adds new structures for power generation and shuttle delaying
-Other changes I've probably forgotton, but are too lazy to scrounge through the code at 12:43 AM
2020-07-12 00:43:54 -04:00
Ghommie
de77b7139c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-06-23 00:13:14 +02:00
silicons
99a7c49e52
Merge pull request #12561 from shellspeed1/Ports-kyro-chems
...
Ports IV bags from TG
2020-06-21 14:11:10 -07:00
shellspeed1
9197cb4813
allows storage in medbelts and organ boxes.
2020-06-18 21:06:22 -07:00
Timothy Teakettle
4c55e86da7
part 2
2020-06-10 23:14:25 +01:00
Ghom
8cb15f9279
Actually Balanced and Standardized Vendor Prices. ( #12495 )
2020-06-09 22:22:53 -07:00
Ghommie
30ab79e09e
Porting the twohanded component.
2020-05-17 18:16:53 +02:00
Ghommie
a194d7dafe
merge conflict and job/dept discounts support.
2020-05-03 02:11:05 +02:00
Trilbyspaceclone
89bb18fe98
Update belt.dm
2020-04-25 00:50:03 -04:00
Ghommie
4c6f1b622b
Porting Goofconomy & co.
2020-04-17 07:48:11 +02:00
Ghommie
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
Ghommie
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
Ghommie
c3faf94d8f
WIP
2020-03-30 05:29:39 +02:00
kevinz000
6754b794b1
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-20 22:59:17 -07:00
necromanceranne
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
kevinz000
6af9c54da5
better
2020-03-16 04:59:55 -07:00
kevinz000
2a9e4bebdd
priority
2020-03-16 04:24:18 -07:00
kevinz000
d32bff7815
return list
2020-03-16 03:35:10 -07:00
kevinz000
703fca5f90
add owner argument
2020-03-16 03:24:19 -07:00
kevinz000
4d0677daa9
s
2020-03-14 21:48:23 -07:00
Ghommie
2b4b626fac
support for items that switch states through update_icon.
2020-03-10 16:55:30 +01:00
Ghommie
fc76cd9a9b
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
Ghommie
8fbfd07692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
Ghom
26bbc64f16
Merge pull request #11136 from Owai-Seek/broomport-2-17-19
...
Ports Broom, Tweak Janitor Vendor
2020-02-20 11:48:06 +01:00
Ghom
89f256866d
Merge pull request #11033 from kevinz000/cmo_drapes
...
gives CMO special surgery drapes that can initiate techweb surgeries without operating console
2020-02-20 11:24:50 +01:00
Winter Flare
1a994e7f1e
Ports Broom, Tweak Janitor Vendor
...
Ports Brooms from TG https://github.com/tgstation/tgstation/pull/49120
Makes Broom printable.
Reduces Broom sound effect.
Updates Janitor Vendor to have equipment for at least 2 janitors.
2020-02-17 23:36:22 -05:00
kevinz000
70e752dbc9
this is totally not laggy
2020-02-11 23:45:22 -07:00
Linzolle
c5bbce0928
add the BOW
2020-02-09 18:36:36 -06:00
Ghommie
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
