zerothebigboy
|
4c2fc18a0a
|
cheesed to meet you
|
2022-08-10 11:13:58 -04:00 |
|
zerothebigboy
|
f39de3b781
|
yeah
|
2022-08-09 13:26:13 -04:00 |
|
Hatterhat
|
44b23b873d
|
crusher rename + 350 chr limit descs
|
2022-08-05 17:41:41 -05:00 |
|
SandPoot
|
695835fcd6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
|
2022-04-09 00:03:13 -03:00 |
|
silicons
|
dee1db4a3a
|
Merge pull request #15558 from SandPoot/mechs-are-vehicles
/obj/mecha ➡ /obj/vehicle/sealed/mecha
|
2022-04-08 18:26:47 -07:00 |
|
SandPoot
|
586a035132
|
Update files
|
2022-04-06 18:41:31 -03:00 |
|
Artur
|
c36019bf56
|
Adds stasis beds
|
2022-04-06 15:38:05 +03:00 |
|
SandPoot
|
189716314f
|
Would you like some defines in these trying times?
|
2022-03-23 12:10:02 -03:00 |
|
SandPoot
|
5029af901b
|
Upload files
|
2022-02-25 16:58:09 -03:00 |
|
Hatterhat
|
0077f682fd
|
crusher gauntlets - resonator hitsound, sharpness to SHARP_NONE (#15458)
* boo womp
* wrongsonator
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
|
2022-01-09 18:46:48 +01:00 |
|
SandPoot
|
5b85c260a7
|
Upload files
|
2021-11-15 01:34:30 -03:00 |
|
Letter N
|
bcdf96f274
|
Revert "TGUI alerts, lists, inputs"
|
2021-10-28 12:17:29 +08:00 |
|
silicons
|
a14549d07b
|
Merge pull request #15299 from Hatterhat/cgau
funny hands gaming - adds proto-kinetic gauntlets
|
2021-10-27 13:36:08 -07:00 |
|
SandPoot
|
13d7a166fe
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
|
2021-10-27 13:54:49 -03:00 |
|
Hatterhat
|
7fb3666f43
|
funny hands gaming
|
2021-10-22 22:05:18 -05:00 |
|
Emily
|
57950045a7
|
Fixes the sprites for wielding.
|
2021-10-20 10:06:14 +02:00 |
|
SandPoot
|
5aa12b4716
|
There's a bounty for this right? i spent nearly two full days at this
|
2021-10-05 18:10:32 -03:00 |
|
WanderingFox95
|
fe8a652689
|
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
|
2021-09-19 21:32:03 +02:00 |
|
zerothebigboy
|
5206524dd4
|
gommit
|
2021-09-02 07:38:48 -04:00 |
|
WanderingFox95
|
97e4b7aef9
|
Apply suggestions from code review
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
|
2021-07-21 19:58:58 +02:00 |
|
WanderingFox95
|
fabd42be43
|
lowercase items #2
|
2021-07-20 23:00:55 +02:00 |
|
WanderingFox95
|
1af648dd47
|
Bone Spade & Glaive
|
2021-07-20 18:56:10 +02:00 |
|
silicons
|
c7766b0f02
|
Merge pull request #14895 from shellspeed1/another-pod
Adds a new survival pod, the penthouse pod.
|
2021-06-29 08:48:55 -07:00 |
|
shellspeed1
|
f52385ca46
|
all the stuff to add pod to code
|
2021-06-27 03:39:13 -07:00 |
|
silicons
|
1a800cc470
|
modifications
|
2021-06-07 19:40:16 -07:00 |
|
silicons
|
40f2c06f2e
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-07 16:47:11 -07:00 |
|
shellspeed1
|
e4e5d8f5cd
|
adds an pod for projects
|
2021-05-17 00:59:10 -07:00 |
|
silicons
|
1585d1c2be
|
fixes
|
2021-04-26 23:32:33 -07:00 |
|
Letter N
|
935e46b492
|
The Mapping Update
Cleans up the map (again)
Makes mining code more better
|
2021-03-12 12:11:35 +08:00 |
|
SandPoot
|
123de14009
|
upload files
|
2021-02-18 15:05:39 -03:00 |
|
SandPoot
|
f738023097
|
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
|
2021-02-18 15:04:46 -03:00 |
|
SandPoot
|
cf2e70671a
|
upload files
|
2021-02-18 14:47:10 -03:00 |
|
Ghommie
|
90c4cb2022
|
Here I fix a few issues.
|
2020-10-25 14:50:42 +01:00 |
|
Hatterhat
|
4195f96876
|
glaive daggers squashed
|
2020-10-03 14:32:19 -05:00 |
|
timothyteakettle
|
d2f4d675a4
|
fuck
|
2020-09-10 03:55:24 +01:00 |
|
Timothy Teakettle
|
f1cd94fc97
|
emp rework
|
2020-09-09 23:14:06 +01:00 |
|
silicons
|
9e204f167f
|
Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces
Miner Loot Shuffle MK III
|
2020-09-06 01:58:46 -07:00 |
|
silicons
|
7b50b22c7b
|
Merge pull request #13244 from lolman360/AnPrimAssistants
Blacksmithing 2: Anarcho-Primitivist Assistants (travis don't fail on me now)
|
2020-09-05 02:20:11 -07:00 |
|
Ghommie
|
dc9b024fae
|
Blemishes begone.
|
2020-09-02 19:16:16 +02:00 |
|
Trilbyspaceclone
|
c4885d81f3
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-27 03:41:14 -04:00 |
|
lolman360
|
f2a7c2599d
|
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
|
2020-08-24 09:36:36 +10:00 |
|
silicons
|
a8ee36fe85
|
fixes wormhole jaunters and makes them no longer collide with bohs/other bluespace teleportation disruptors (#13209)
* Update wormhole_jaunter.dm
* Update wormhole_jaunter.dm
|
2020-08-23 21:00:07 +02:00 |
|
lolman360
|
bda2c740ba
|
Merge branch 'master' into AnPrimAssistants
|
2020-08-21 11:08:13 +10:00 |
|
lolman360
|
7ca4fa2f55
|
compilies/??
|
2020-08-15 17:09:12 +10:00 |
|
lolman360
|
0bc79b82eb
|
ABDCE
|
2020-08-14 20:18:55 +10:00 |
|
Hatterhat
|
d5b788a655
|
shortparry window restored, glaive parry req wield
|
2020-08-12 23:33:59 -05:00 |
|
Trilbyspaceclone
|
1b61a5feb2
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-12 15:10:37 -04:00 |
|
Hatterhat
|
e95dcba705
|
price nerf, tweaks, aprc
|
2020-08-08 12:17:56 -05:00 |
|
Hatterhat
|
9a862b10e1
|
the perfect parry update
|
2020-08-08 10:47:43 -05:00 |
|
Hatterhat
|
fd8f3781cc
|
test commit please ignore
|
2020-08-07 17:03:38 -05:00 |
|