kiwedespars
|
5ce42584b2
|
void tp effect, sound changes
|
2021-03-10 21:16:08 -08:00 |
|
kiwedespars
|
3ce6459aef
|
void heretic and many other prs
|
2021-03-09 02:58:34 -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 |
|
Timothy Teakettle
|
5ebdb6deec
|
yes
|
2021-02-09 09:37:17 +00:00 |
|
Letter N
|
02ca168df3
|
why are we building windows facing nothing but rock infront of it?
|
2021-01-20 11:37:44 +08:00 |
|
silicons
|
dedb0cb62e
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-19 04:24:42 -07:00 |
|
The0bserver
|
1b469bdfda
|
The power of overwriting...
|
2021-01-14 01:03:48 -05:00 |
|
silicons
|
9733305997
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-09 14:56:32 -08:00 |
|
silicons
|
ddad368d6a
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-08 00:33:57 -08:00 |
|
silicons
|
1022837827
|
Update misc.dm
|
2021-01-08 01:29:20 -07:00 |
|
silicons
|
407b1fe071
|
Update humans.dm
|
2021-01-07 23:14:59 -07:00 |
|
silicons
|
78322199e3
|
fix
|
2021-01-01 00:38:46 -08:00 |
|
silicons
|
34256a61ef
|
remove drips
|
2020-12-30 21:06:34 -08:00 |
|
silicons
|
e6000ceffa
|
meme
|
2020-12-29 11:12:06 -08:00 |
|
silicons
|
57d85f7e86
|
okay
|
2020-12-27 05:20:29 -08:00 |
|
silicons
|
a42fa987ba
|
ok
|
2020-12-26 22:43:25 -08:00 |
|
silicons
|
5266ae1437
|
okay
|
2020-12-26 22:28:41 -08:00 |
|
silicons
|
bfb3d087c3
|
ok
|
2020-12-26 20:50:28 -08:00 |
|
silicons
|
d3414a4d23
|
ok
|
2020-12-26 20:47:50 -08:00 |
|
silicons
|
dafc6bf89f
|
fix
|
2020-12-26 20:41:21 -08:00 |
|
silicons
|
3228435237
|
errors
|
2020-12-26 20:33:16 -08:00 |
|
silicons
|
6044086de0
|
changes
|
2020-12-26 20:29:52 -08:00 |
|
silicons
|
b7cd14b41e
|
poggy?
|
2020-12-26 20:09:24 -08:00 |
|
silicons
|
9f130e0c5a
|
blood
|
2020-12-26 14:09:10 -08:00 |
|
silicons
|
5c0b4f824f
|
hoh boy
|
2020-12-26 12:42:03 -08:00 |
|
silicons
|
45af2360ad
|
changes
|
2020-12-26 11:35:47 -08:00 |
|
silicons
|
5cf717e75d
|
self message
|
2020-12-25 16:10:32 -08:00 |
|
silicons
|
5e66e4509f
|
wew
|
2020-12-25 16:07:17 -08:00 |
|
Letter N
|
abd94d1c03
|
Merge remote-tracking branch 'origin/master' into semi-sync
|
2020-12-21 21:19:06 +08:00 |
|
Letter N
|
a808f805d4
|
ASYNC EVERYTHING!
|
2020-12-21 16:24:51 +08:00 |
|
MrJWhit
|
53d41ea190
|
Update mines.dm
|
2020-12-14 15:57:57 -05:00 |
|
Letter N
|
cf692e8426
|
subsystem upgrades
|
2020-12-14 15:28:59 +08:00 |
|
silicons
|
803bff4e5f
|
funny
|
2020-11-12 23:34:42 -07:00 |
|
Ghommie
|
f49f72338f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841
|
2020-10-25 15:01:57 +01:00 |
|
Ghommie
|
90c4cb2022
|
Here I fix a few issues.
|
2020-10-25 14:50:42 +01:00 |
|
Ghommie
|
c0f3317c01
|
mime/clown masks' face concealment altclick toggle. Plasmaman helmets' welding visors & smileys port.
|
2020-10-16 20:27:09 +02:00 |
|
Tupinambis
|
3224533a7c
|
Merge branch 'master' into spooder
|
2020-10-11 14:31:23 -05:00 |
|
silicons
|
ad32b8f437
|
Merge pull request #13472 from timothyteakettle/slime-puddle
the pr that lets slimes turn into useless puddles
|
2020-10-10 11:14:25 -07:00 |
|
silicons
|
19f1e99a8c
|
mass ports like 15 tg prs + counting (#13386)
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
|
2020-10-10 12:20:33 +02:00 |
|
timothyteakettle
|
950cb05617
|
Merge remote-tracking branch 'upstream/master' into slime-puddle
|
2020-10-02 15:53:48 +01:00 |
|
Tupinambis
|
d2860b38c7
|
normalization
|
2020-10-01 18:46:31 -05:00 |
|
Tupinambis
|
f1bc1ccafb
|
Merge branch 'master' into spooder
# Conflicts:
# code/modules/surgery/organs/eyes.dm
I have no idea if this will work
|
2020-10-01 17:10:42 -05:00 |
|
Tupinambis
|
0bb889932d
|
Completed!
|
2020-09-30 19:05:56 -05:00 |
|
Tupinambis
|
113b84ab50
|
Ports arachnids from WaspStation
|
2020-09-30 15:10:17 -05:00 |
|
timothyteakettle
|
ccb774b8f2
|
puddles
|
2020-09-30 02:15:34 +01:00 |
|
Putnam
|
4252ef606d
|
Added policy config for sentient pyro slimes (no actual policy)
|
2020-09-27 15:28:24 -07:00 |
|
silicons
|
07b28f40de
|
Merge pull request #13359 from Ghommie/Ghommie-cit838
Turf visuals fix plus corrected names of a couple things.
|
2020-09-07 13:42:05 -07:00 |
|
Ghommie
|
4a04b22b72
|
Turf visuals fix plus corrected names of a couple things.
|
2020-09-06 18:53:01 +02:00 |
|