Hatterhat
fa799a0ac5
it compiles
2020-12-19 19:02:56 -06:00
Hatterhat
b8b2f34735
funny knife
2020-12-19 18:45:25 -06:00
Putnam
d47dcc941c
Polycircuit sanity checking
2020-12-17 22:54:52 -08:00
MrJWhit
f5b99b83f8
Fully functional
2020-12-13 02:29:29 -05:00
silicons
8d398b3e24
Merge pull request #13719 from shellspeed1/Adds-construction-bags-from-tg
...
Ports construction bags and makes it easier to get material bags. (READY)
2020-12-03 16:33:47 -07:00
shellspeed1
3735efbfca
Ports construction bags
2020-11-29 18:29:03 -08:00
silicons
75d807df4e
Merge pull request #13694 from TheObserver-sys/PublicMiningRevival
...
Local Assistant man can now bash rock again!*
2020-11-21 18:25:13 -07:00
silicons
f8d43b7544
Merge pull request #13679 from DeltaFire15/system-corruption
...
[TESTMERGE ONLY] System Corruption for robotic species
2020-11-18 22:54:51 -07:00
Putnam3145
9d300ade35
Merge pull request #13677 from silicons/newlines
...
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
The0bserver
6d1ace27f7
Initial Commit: Mapping is painful
2020-11-18 00:38:35 -05:00
silicons
891d4ec76e
Merge pull request #13681 from DeltaFire15/supplypod-shrapnel
...
Fixes a bunch of supplypod related stuff
2020-11-17 01:12:56 -07:00
silicons
f11b636727
Merge pull request #13674 from DeltaFire15/vtec-fixing
...
The borg VTEC ability no longer persists after the upgrade is removed
2020-11-17 01:10:53 -07:00
silicons
a950bcb0fb
Merge pull request #13644 from DeltaFire15/hybrid-limbs-wound-stuff
...
[READY] Hybrid bodyparts - wound surgery edition
2020-11-17 01:09:47 -07:00
DeltaFire
44a49a7261
Merge remote-tracking branch 'upstream/master' into vtec-fixing
2020-11-16 04:30:45 +01:00
DeltaFire
8f04d7f0d1
Merge remote-tracking branch 'upstream/master' into system-corruption
2020-11-16 04:29:59 +01:00
DeltaFire
185c8929b0
Merge remote-tracking branch 'upstream/master' into supplypod-shrapnel
2020-11-16 04:29:43 +01:00
SandPoot
00adf078b0
this is needed
2020-11-15 19:13:01 -03:00
SandPoot
cbb44674ac
fix + renaming global list?
2020-11-15 19:10:50 -03:00
SandPoot
936bda44db
upload gift.dm
2020-11-14 20:38:23 -03:00
DeltaFire
e0b2156142
fixes fixes fixes
2020-11-14 19:26:54 +01:00
silicons
803bff4e5f
funny
2020-11-12 23:34:42 -07:00
DeltaFire
5af48a22dd
adds a surgery to fix corruption
2020-11-13 02:24:52 +01:00
DeltaFire
76fe1a77bc
Merge remote-tracking branch 'upstream/master' into system-corruption
2020-11-13 01:00:50 +01:00
DeltaFire
d5993539b8
fixes vtec persisting after removal
2020-11-12 16:27:09 +01:00
silicons
0001a2edca
Merge pull request #13669 from Arturlang/sacrifice_tweaks
...
Makes cult sacrifice not permakill people anymore.
2020-11-11 11:16:15 -07:00
Artur
503d0156c6
Does the thing
2020-11-08 23:24:58 +02:00
silicons
577cd537b3
Merge pull request #13654 from ArchieBeepBoop/giftfix
...
Christmas Tree / Jacqueen Gift Blacklist
2020-11-07 00:32:09 -07:00
silicons
27f53a8af7
Merge pull request #13641 from MrJWhit/combat-knife-nerf
...
Nerfs combat knife damage
2020-11-07 00:29:14 -07:00
silicons
1a2abc5a2e
Merge pull request #13604 from Trilbyspaceclone/welding
...
Makes welder code better*
2020-11-07 00:18:26 -07:00
Dip
3afd604913
remove projectiles
2020-11-04 17:28:23 -03:00
DeltaFire
c4b0f21fd2
buncha stuff
...
All tools now have the surgical tool flag (save for wires since those have force 0 anyways and are only used very rarely in surgery), but yeah, since we got far more species using robot surgeries (0 -> 3), might be good to not have them accidentally beaten up.
Also fixes organs being eaten after inserting them, yay!
2020-11-04 04:34:56 +01:00
Dip
76e739142b
Yeah let's fucking not have jacqueen or the christmas tree spawn runtimes
2020-11-02 16:46:34 -03:00
Timothy Teakettle
db87297536
fix ( #13632 )
2020-11-01 22:03:43 +01:00
DeltaFire15
91584053f5
Fixes a bunch of fallout from the tgui PR ( #13648 )
...
* screamies
fixes a bunch of fallout from the tgui PR.. probably
* Empty commit to poke travis
2020-11-01 21:59:22 +01:00
DeltaFire
feed428510
healthscanner support
...
Health scanners now show the type of toxin the target is using (Tox / Corruption)
2020-11-01 05:10:38 +01:00
Trilbyspaceclone
366a605915
Update weldingtool.dm
2020-10-29 10:53:45 -04:00
MrJWhit
92f31a9a5f
Update kitchen.dm
2020-10-28 15:39:51 -04:00
Trilbyspaceclone
a837af1436
Update weldingtool.dm
2020-10-28 12:37:50 -04:00
Ghommie
90c4cb2022
Here I fix a few issues.
2020-10-25 14:50:42 +01:00
Trilbyspaceclone
bb155f8784
Apply suggestions from code review
...
Grammar
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com >
2020-10-24 07:25:27 -04:00
Trilby
8fa595ccea
Makes welder code better*
2020-10-21 05:50:41 -04:00
silicons
ff46bfda10
Merge pull request #13547 from zeroisthebiggay/crepe
...
security fashion power crêpe but it's a sheath for your anime sword
2020-10-11 17:33:29 -07:00
DeltaFire
4f734f68a9
moves damage checks
...
title. Makes it harder to circumvent them.
2020-10-11 16:18:25 +02:00
DeltaFire
a5fce4b6ed
Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2
2020-10-11 15:39:41 +02:00
zerothebigboy
ff937e249f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into crepe
2020-10-11 03:14:02 -04:00
silicons
7f611a98e1
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-10-10 22:23:22 -07:00
zerothebigboy
9e04d5723c
Merge branch 'crepe' of https://github.com/zeroisthebiggay/Citadel-Station-13 into crepe
2020-10-11 01:20:34 -04: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
silicons
d2ce6ca709
Merge pull request #13540 from TheObserver-sys/QoLPass
...
Service+Plumbing QoL Pass 1: Beakers, Belts, Plungers and Pipes
2020-10-10 22:04:49 -07:00
silicons
c3983ee55b
Merge pull request #13535 from Hatterhat/energy-sabres
...
[READY] Energy Sabers - an elegant esword skin for a more civilized age
2020-10-10 22:04:17 -07:00
