Timothy Teakettle
60c8dd283e
shitcode begone
2020-08-22 20:02:36 +01:00
timothyteakettle
47424be1c0
tail fix
2020-08-18 00:46:05 +01:00
Timothy Teakettle
f5300750b5
Revert "[TESTMERGE ONLY] FUCK"
2020-08-17 03:18:36 +01:00
silicons
4cd731ce11
Revert "cease your shitcode: cum edition"
2020-08-16 19:06:57 -07:00
silicons
b56742beb5
Merge branch 'pr-13110'
2020-08-16 18:40:23 -07:00
Lin
2fa0b4ae6c
Merge pull request #13105 from silicons/underwear_412
...
ports binder bras from rp
2020-08-14 13:03:25 -05:00
Timothy Teakettle
4a2bbe66d6
Merge branch 'master' into cum
2020-08-11 18:30:30 +01:00
silicons
b16f920479
Merge pull request #13086 from ArchieBeepBoop/dev
...
Add Skulldog Snout
2020-08-11 01:44:29 -07:00
silicons
035422ed7f
Merge pull request #13098 from LetterN/ToS-component
...
Mafia Component
2020-08-11 01:41:13 -07:00
timothyteakettle
b9efa05ec4
double FUCK
2020-08-11 03:40:41 +01:00
timothyteakettle
84a8585055
FUCK
2020-08-11 03:38:25 +01:00
timothyteakettle
1f240b883f
holy shit
2020-08-11 03:37:04 +01:00
silicons
375f740d8b
sigh
2020-08-10 04:52:33 -07:00
silicons
3795bcf2d0
Merge pull request #13097 from zeroisthebiggay/yessalthairpr
...
Patented Zero Salt PR That Adds One New Hair Style That Is Just Pompadourless Volaju Because
2020-08-10 02:29:47 -07:00
Letter N
a4040ace26
hewwo have you tried to work?
2020-08-10 10:50:07 +08:00
ArchieBeepBoop
950c8fb8be
Merge pull request #2 from ArchieBeepBoop/master
...
Update Dev Branch
2020-08-09 13:23:25 -03:00
zerothebigboy
822c17e444
a
2020-08-09 08:07:40 -04:00
Dip
ab2de2e55c
Added Skulldoggo Snout
2020-08-08 16:01:37 -03:00
Letter N
333ca2cc7b
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-06 18:26:04 +08:00
Seris02
82790cffed
fixes lizard code
2020-08-03 21:39:11 +08:00
Seris02
aeec3a3404
lizards no longer have broken spines
2020-08-03 17:29:32 +08:00
Letter N
b376a6b6c4
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-07-30 14:43:52 +08:00
Letter N
0805265412
yet another batch. MAJOR: APC
2020-07-30 12:54:53 +08:00
Timothy Teakettle
974b80a2fd
Merge branch 'master' into wound-port
2020-07-18 21:45:24 +01:00
timothyteakettle
e8fade4f7f
changes
2020-07-18 02:29:12 +01:00
Timothy Teakettle
a4478b0cda
it continues
2020-07-17 22:38:28 +01:00
silicons
e03948dcba
Merge pull request #12229 from Arturlang/TGUI-3.0
...
[READY]TGUI 3.0
2020-07-16 17:28:42 -07:00
Letter N
2afab07b4a
https://github.com/tgstation/tgstation/pull/52255
2020-07-16 20:05:37 +08:00
Artur
d0f1a805e4
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-14 16:15:48 +03:00
silicons
6634e43be4
fix
2020-07-07 07:41:33 -07:00
silicons
cee15792b7
ok
2020-07-07 07:25:10 -07:00
Artur
2931c03ccb
Ghommie fixes
...
strongDMM autofixed wildest, hopefully it didnt break anything
2020-07-02 01:48:28 +03:00
Artur
20245f7319
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-30 02:30:29 +03:00
Ghommie
ae053a9a08
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800
2020-06-23 03:12:49 +02:00
Artur
c41d2e78be
Conflicts!!!
2020-06-22 17:39:24 +03:00
kevinz000
445d94f335
haha whew
2020-06-17 21:32:10 -07:00
Artur
7055e6c47a
Ports https://github.com/tgstation/tgstation/pull/51585
2020-06-17 17:07:42 +03:00
Artur
ceba739231
Cooonflicts
2020-06-16 01:23:42 +03:00
deathride58
245bf750c7
fixes a pair of dos vectors. this is apparently a day -1 patch! ( #12511 )
2020-06-12 11:54:18 -07:00
Artur
b6dc41b852
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-09 11:07:39 +03:00
ynot01
ab3799ae7a
Ports cornrows hairstyles from yogstation ( #12423 )
2020-06-02 15:29:07 -07:00
Artur
19f215477e
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
Rohesie
5ab8d41d9a
horns ( #12384 )
2020-05-30 03:25:27 +02:00
Ghommie
a7934f3f88
event.
2020-05-29 18:58:34 +02:00
Putnam3145
811b801569
fixes ghost role eligibility delay ( #12379 )
2020-05-28 14:11:42 +02:00
Artur
9d04b0835b
Conflicts galore
2020-05-21 21:08:12 +03:00
Kraseo
a7053a978f
Ports a tail from the RP server ( #12301 )
...
* tailse
* forgot to reorder it lol
* and i guess felinids and anthros can use it too
2020-05-20 18:37:38 -07:00
Ghom
08280a853e
Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers' ( #12282 )
...
* Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers'
* Ok, signals.
2020-05-17 17:04:15 -07:00
Ghom
7c7147cb3e
Field of Vision component. ( #12075 )
...
* Hopeless WIP for vision cones.
* Core component and hooks done
* Removing clutter.
* linter bashing me for using statements as args.
* Ok.
* continue
* bring back the macro
* Configs and openspace filter.
* Chat plane, reset perspective signal, mechs/vehicles cases, machineries.
* view, viewers and spoopy ghosts.
* Renamed component, admin fun button and snowflakes robots.
* Whoopsie.
* Yikes
* test merge tweak.
* radial yaketi sax.
* Fixed tgui UIs, some messages not displayed to the target.
* Documentation and a little bugfix.
* Pulling QoL, seventh plane made in this PR.
* Fix.
* Tweaks and improvements.
* Update randomverbs.dm
2020-05-15 15:25:04 -07:00
Ghom
d16c97f06b
Taur fixes. ( #12248 )
2020-05-15 07:16:09 -07:00
