Commit Graph

9242 Commits

Author SHA1 Message Date
silicons
d4f978c6db Merge pull request #14172 from keronshb/cell-charger-upgrade
Cell Charger Buffs
2021-02-04 12:50:30 -07:00
silicons
993a849700 Merge pull request #14155 from SmArtKar/tgui_observe
Port of TG's "Auto Observe"
2021-02-04 12:49:09 -07:00
keronshb
10c0e40d71 Removes extra update icon
Removes extra update icon
2021-01-30 14:40:11 -05:00
keronshb
f85accc406 Upgrades cell chargers
Similar to weapon cell chargers
2021-01-30 13:26:45 -05:00
DeltaFire
c417d576ec Merge pull request #14152 from Arturlang/turret_fixing_redo
Brings back turret fixing
2021-01-30 19:10:10 +01:00
silicons
1974f2b41d Merge pull request #14148 from zeroisthebiggay/whytho
gives the advanced extinguisher a sprite that doesn't look like total dogshit even by codersprite standards
2021-01-29 07:29:28 -07:00
SmArtKar
a7bc066891 Auto-Observe! 2021-01-28 17:09:28 +03:00
Artur
f2343b32fe Brings back turret fixing 2021-01-28 09:39:21 +02:00
zerothebigboy
e7d8021b81 a 2021-01-27 18:46:11 -05:00
Lin
b1b5adb90d Merge pull request #14086 from Citadel-Station-13/silicons-patch-25
officially adds the functionality to insert holdable mobs into colormate
2021-01-27 17:18:29 -06:00
Lin
f7c1cdc571 Merge pull request #14112 from silicons/ex_act_3
~~hugboxes~~ fixes the bug (that was probably my fault) that makes 1 dev explosions ALWAYS delete brain
2021-01-27 17:16:44 -06:00
Lin
4e3a4a30c3 Merge pull request #14139 from Citadel-Station-13/silicons-patch-2
small refactor to pinpointers, allow pinpointers with custom targets
2021-01-27 17:16:09 -06:00
Putnam3145
2765aed0b4 Merge pull request #14085 from Citadel-Station-13/silicons-patch-24
ok as funny as this is, painting pets in gear painters is the result of a potentially awful bug regarding mob holder drop logic
2021-01-26 22:24:57 -08:00
silicons
0a5ad34fd6 Update pinpointer.dm 2021-01-26 07:26:59 -07:00
silicons
93ff29a579 Update pinpointer.dm 2021-01-26 00:00:39 -07:00
silicons
6a2ae34ebe Merge pull request #14111 from Arturlang/revenant_TK
[READY]Gives the revenant TK
2021-01-25 23:17:09 -07:00
silicons
b77cc68e8d Merge pull request #14133 from Hatterhat/depcards-nobody-asked-for
department budget cards but not in lockers
2021-01-25 23:02:11 -07:00
silicons
de8d778f76 Merge pull request #14134 from Arturlang/Give_improvements
[READY]Give Improved
2021-01-25 23:02:03 -07:00
silicons
efecc1804b Merge pull request #14114 from Hatterhat/fgs
itt: i dont test my code again - free golem ship GPSes start disabled
2021-01-25 22:59:09 -07:00
silicons
6094293b4b Merge pull request #14105 from DeltaFire15/heretic-target-fix
Heretic sacrifice target logging + a fix
2021-01-25 22:58:54 -07:00
raspy-on-osu
622a3df378 Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor 2021-01-24 19:21:24 -05:00
Artur
91cd7378ca Give Improved 2021-01-24 16:05:42 +02:00
Hatterhat
cbc19c7e91 depcards not in lockers 2021-01-23 19:37:39 -06:00
MrJWhit
3e157c3aa8 Update headset.dm 2021-01-22 19:18:28 -05:00
Hatterhat
95db018de8 itt: i dont test my code again 2021-01-20 18:34:57 -06:00
silicons
fa587e3d1a Merge pull request #14100 from Hatterhat/sheath-exp
twinsheath additions
2021-01-20 15:20:45 -07:00
silicons
f7c6dbd8ba Merge pull request #14110 from BlueWildrose/nicebobbertsonsyougotthere
Removes oversized genitalia analysis from medical scanners
2021-01-20 15:17:12 -07:00
silicons
5afe3bbb6f Merge remote-tracking branch 'citadel/master' into ex_act_3 2021-01-20 15:15:10 -07:00
silicons
f3cdaf941b Update colormate.dm 2021-01-20 15:11:04 -07:00
silicons
f6eca7afad hugboxy shit 2021-01-20 15:06:53 -07:00
Artur
41f4586f50 Forgot to undo some testing changes 2021-01-20 22:30:14 +02:00
Artur
4457d568dd Tank memes finished 2021-01-20 20:25:36 +02:00
Artur
87c9201707 No gunning sadly 2021-01-20 19:51:11 +02:00
Artur
66979e2364 Merge branch 'master' into revenant_TK 2021-01-20 18:27:11 +02:00
Artur
16e0b85b44 More funshit 2021-01-20 18:23:28 +02:00
DeltaFire
e24eb14121 args
these are needed for the CI not to fail, even if unused in most cases.
2021-01-20 16:32:15 +01:00
Blue Wildrose
80ccc93fd7 Removes breast and penis analysis from medical scanners 2021-01-20 07:32:03 -07:00
Artur
3737c52df8 Funny actions 2021-01-20 15:23:34 +02:00
Letter N
02ca168df3 why are we building windows facing nothing but rock infront of it? 2021-01-20 11:37:44 +08:00
Letter N
021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
Letter N
c08765d0eb let's not get ddosed 2021-01-20 10:23:30 +08:00
Hatterhat
fccf24ac17 sheef 2021-01-19 16:54:49 -06:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
silicons
f0a9a7a179 fix 2021-01-19 04:21:21 -07:00
Lin
5eafdd164f Merge pull request #14069 from Citadel-Station-13/silicons-patch-18
moves say_emphasis from compose_message to lang_treat to prevent _underlines_ from colliding with command_headset spans having _ in it
2021-01-18 13:21:13 -06:00
Lin
73213b4bad Merge pull request #14079 from LetterN/patch-3
Fixes this vending oversight
2021-01-18 13:17:05 -06:00
silicons
2266a9e17b Merge pull request #14037 from DeltaFire15/nanogel
Nanogel for robotic limbs
2021-01-17 20:42:19 -07:00
silicons
829e946755 Merge pull request #14061 from Hatterhat/gauze-parity
something something gauze things
2021-01-17 20:40:09 -07:00
silicons
db1693b906 Update colormate.dm 2021-01-17 20:39:00 -07:00
silicons
ffa56152d4 Update colormate.dm 2021-01-17 20:36:19 -07:00