Commit Graph

29271 Commits

Author SHA1 Message Date
alberyk
e67cfbe2de Fixes a lot of stuff 2022-02-10 15:04:07 -03:00
alberyk
beecb5f802 Merge branch 'master' into fourth_week_preparation_and_fixes
# Conflicts:
#	code/game/jobs/faction/zavodskoi.dm
2022-02-10 13:36:46 -03:00
Casper3667
785ccadd5b adds a missing t to a custom item name (#13132)
Co-authored-by: TGW <mc-casper@hotmail.dk>
2022-02-09 18:50:44 -03:00
Casper3667
fc63dbf205 Fixes held mob sprites (#13138)
* Fixes held mob icon sprites

* quick fix

Co-authored-by: TGW <mc-casper@hotmail.dk>
2022-02-09 18:50:19 -03:00
Geeves
62e8224b5e Vaurca Hivenet Stuff (#12874) 2022-02-09 18:27:51 +01:00
VisVirific
b80671be85 IV Drip Blood Injection Stop Quality of Life (#12988) 2022-02-09 18:27:42 +01:00
Avery Marie
b79795b488 Adds a white Captain's dress (#13084) 2022-02-09 18:07:49 +01:00
Avery Marie
25ff6b47d7 Cyberwarfare suit buff (#13038) 2022-02-09 11:42:33 +01:00
Geeves
4601533639 Skrellprints (#13091) 2022-02-09 11:36:32 +01:00
Geeves
95cdd13097 Redacted Tag (#13049) 2022-02-08 11:41:45 +01:00
VisVirific
766a779a7b Autoinjector Slot Tweak (#13080) 2022-02-08 11:41:38 +01:00
listerla
c14d8377a9 Lowers headbutt damage by 5 (#13082) 2022-02-08 11:41:31 +01:00
Sparky
193186ac9f Mech Organs Don't Squeltch (#13083) 2022-02-08 11:40:54 +01:00
Dekserrrrrr
8878c8f06a Unathi hiss2 is now loud (#13075) 2022-02-06 18:32:30 -03:00
granodd
d91b0c28ed Battlemonsters Tweak (#13071) 2022-02-06 18:27:55 -03:00
desven
266b1183f5 Allows Vaurcae to be Zavod (#13070)
* zzzprites

* jobs

* cl
2022-02-06 18:24:25 -03:00
Geeves
de1743a1b1 Railing Stuff (#13035) 2022-02-06 18:21:56 -03:00
Aticius
69e4f11bc9 Adds Akara mask (#13077) 2022-02-06 18:18:15 -03:00
Sparky
a7aaf27c81 Limits what can go in wallets. (#13076)
* inhaler

* 180
2022-02-06 18:11:43 -03:00
listerla
62c2283b13 Adds new accents to stationbounds (#13063) 2022-02-06 18:09:17 -03:00
Alberyk
f42edd018e Adds more customization to robotic internal organs but it is not broken (#13068) 2022-02-06 18:07:42 -03:00
alberyk
32fb3e19ee Network tweak 2022-02-06 13:44:03 -03:00
alberyk
e6a2349a04 Merge branch 'master' into cables_fixes 2022-02-06 13:38:46 -03:00
Casper3667
b035a0b8e4 fixes representative wrist and double radio keys (#13106)
Co-authored-by: TGW <mc-casper@hotmail.dk>
2022-02-06 12:01:27 -03:00
Casper3667
6d4131648c makes the hull shield make shielding over some floor types (#13105) 2022-02-06 12:00:33 -03:00
alberyk
b7dd850fd2 Merge branch 'master' into timer_fix 2022-02-05 02:21:26 -03:00
Matt Atlas
d596fd831e Fixes subsystem issues and other timer bugfixes (#13061)
* Debug code to figure out why timer fire isn't yielding

* please man

* thing 2

* BALLS

* BALLS 2

* correction

* remove debug shitcode

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2022-02-05 02:07:06 -03:00
alberyk
ad41fa9de8 Fixes compile and updates to master 2022-02-04 14:23:14 -03:00
alberyk
a61a4b7e2c Merge branch 'master' into fixes_compile 2022-02-04 14:22:38 -03:00
alberyk
44cab6caa5 No dweller 2022-02-04 13:02:25 -03:00
alberyk
8bbc627e3d Fixes compile 2022-02-04 12:52:59 -03:00
alberyk
7a73f99c41 makes asteroid one uniques 2022-02-04 12:52:30 -03:00
Wowzewow (Wezzy)
e314a6ec9b Robot Sprite Update IV (#12919) 2022-02-04 12:33:38 +01:00
Xxxxyobdab
c781e1c7ff biogen/bush (#13029) 2022-02-04 12:22:01 +01:00
Wowzewow (Wezzy)
ba6e7b6014 Chemistry Sprite Tweaks (#13041) 2022-02-04 12:21:49 +01:00
listerla
f61bf53b82 Renames Dionae 'cat ears' to 'small horns' (#13051) 2022-02-04 12:21:26 +01:00
BLUNTFORCE420
dff6489eeb Resprites the 10mm Machine Pistol (#13053) 2022-02-04 12:21:17 +01:00
Jaraci
d3baa0c8e7 Security belts in lockers now spawn partially filled with stuff (#13050) 2022-02-04 00:54:37 +01:00
Matt Atlas
3225711e67 Revert "Adds more customization to robotic internal organs (#12994)" (#13065) 2022-02-02 19:46:57 +01:00
Casper3667
567da024d0 fixes people being unable to play as NT (#13064) 2022-02-02 19:35:58 +01:00
Wowzewow (Wezzy)
23fe07d0d9 Funny PDA Descriptions (#12873) 2022-02-02 17:38:17 +01:00
Sparky
e946d0b704 Zeng-Hu First Responder Coat (#12936) 2022-02-02 17:27:48 +01:00
Geeves
d75c99fbdf Stacking Die (#12929) 2022-02-02 17:13:06 +01:00
Alberyk
a32ce7644e Adds more customization to robotic internal organs (#12994) 2022-02-02 13:07:11 -03:00
Casper3667
f08f84adfb Adds lot of new skrell uniforms (#13015) 2022-02-02 17:01:09 +01:00
listerla
41d95db508 Adds a pair of human lore-related book items (#12903) 2022-02-02 17:00:21 +01:00
Wowzewow (Wezzy)
f7c2fc2e1d Fixes tie clips (#12984) 2022-02-02 16:58:40 +01:00
Wowzewow (Wezzy)
d2c2fbd19c APC fix number 3 (#12992) 2022-02-02 16:52:49 +01:00
Casper3667
1d309ef966 Fixes the ability to join a job as the wrong faction (#13059) 2022-02-02 16:47:35 +01:00
Wowzewow (Wezzy)
621e0c25a7 Fixes chairs for real this time I hope (#12981) 2022-02-01 12:49:53 +01:00