 Ghom
|
7a2e0892d3
|
Merge pull request #11277 from kevinz000/sword_point
En garde! (nah just sword pointing)
|
2020-03-04 17:11:39 +01:00 |
|
|
kevinz000
|
cbf2355f19
|
Update code/datums/elements/sword_point.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-03-03 21:06:05 -07:00 |
|
|
Lin
|
70e2563579
|
Merge pull request #11266 from Ghommie/Ghommie-cit593
Fixing another couple mob holder oversights.
|
2020-02-29 00:13:58 -06:00 |
|
|
kevinz000
|
93d91b1808
|
Merge remote-tracking branch 'citadel/master' into sword_point
|
2020-02-28 13:39:56 -07:00 |
|
|
kevinz000
|
8ef68fa36b
|
En garde!
|
2020-02-28 13:35:41 -07:00 |
|
|
Ghommie
|
11f767d412
|
A couple mob holder oversights. Again?
|
2020-02-27 16:16:21 +01:00 |
|
|
Ghommie
|
fc76cd9a9b
|
Porting update_icon improvements. Part 1.
|
2020-02-27 01:21:03 +01:00 |
|
|
Ghom
|
9355e9319b
|
Merge pull request #11110 from Hatterhat/hyper-96-aus-unk
you kids like extend votes?
|
2020-02-24 16:39:16 +01:00 |
|
|
Hatterhat
|
b89a2314a2
|
mmm that's compiling i don't like that
|
2020-02-22 16:17:51 -06:00 |
|
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
|
Ghom
|
e92183e968
|
Merge pull request #10541 from Detective-Google/the-p-o-o-l
adds the POOL to box station
|
2020-02-21 02:43:04 +01:00 |
|
|
Ghom
|
b028b296f5
|
Update mob_holder.dm
|
2020-02-17 12:17:33 +01:00 |
|
|
Ghom
|
3703110dda
|
Makes the mob holder examine less dumb.
|
2020-02-16 16:10:20 +01:00 |
|
|
kevinz000
|
b46dd3246d
|
Merge pull request #10968 from Citadel-Station-13/Ghommie-patch-4
/datum/element/cleaning cleans your face!
|
2020-02-15 12:16:39 -07:00 |
|
|
kevinz000
|
76b5dec4bb
|
Merge pull request #11040 from Ghommie/Ghommie-cit573
Further mob holder fixes.
|
2020-02-15 11:44:25 -07:00 |
|
|
Ghom
|
12b84aa333
|
Update mob_holder.dm
|
2020-02-12 12:43:47 +01:00 |
|
|
Ghommie
|
e5ab230b26
|
Monky chokehold deluxe.
|
2020-02-12 09:32:38 +01:00 |
|
|
Ghommie
|
e099ed9578
|
Further mob holder fixes.
|
2020-02-12 09:24:49 +01:00 |
|
|
kevinz000
|
58db43621d
|
Merge pull request #10941 from Ghommie/Ghommie-cit561
Adds the ELEMENT_DETACH flag to two elements
|
2020-02-11 00:42:15 -07:00 |
|
|
Ghom
|
82e36846bc
|
/datum/element/cleaning cleans your face!
|
2020-02-08 06:18:00 +01:00 |
|
|
Ghom
|
bb140df39c
|
Fixing mob holders
|
2020-02-08 04:04:16 +01:00 |
|
|
Detective Google
|
f145b8c0b5
|
Merge remote-tracking branch 'upstream/master' into the-p-o-o-l
|
2020-02-07 16:28:47 -06:00 |
|
|
Ghommie
|
16b655b887
|
Adds the ELEMENT_DETACH flag to two elements
|
2020-02-06 23:19:21 +01:00 |
|
|
kevinz000
|
18910a23a2
|
Merge pull request #10881 from Ghommie/Ghommie-cit552
Refactoring mob holders into an element.
|
2020-02-06 00:41:28 -07:00 |
|
|
kevinz000
|
40ab6bdd41
|
changes
|
2020-02-05 00:22:12 -07:00 |
|
|
kevinz000
|
72ddaa2ded
|
Update swimming.dm
|
2020-02-04 23:56:27 -07:00 |
|
|
Ghommie
|
5dc1de1d04
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-05 04:34:54 +01:00 |
|
|
Ghommie
|
89466de29e
|
Good catch linter.
|
2020-02-04 02:30:14 +01:00 |
|
|
Ghommie
|
7723450d11
|
welp.
|
2020-02-04 02:21:23 +01:00 |
|
|
Ghommie
|
d13d8dd953
|
Less hacky.
|
2020-02-04 02:13:11 +01:00 |
|
|
Ghommie
|
63c8612ccd
|
Refactoring mob holders into an element.
|
2020-02-04 01:42:59 +01:00 |
|
|
Ghom
|
73d865d0f3
|
Fixes the petting element.
|
2020-02-03 18:42:22 +01:00 |
|
|
Ghommie
|
55fa48737e
|
Forgot about not versioned files.
|
2020-02-02 01:28:16 +01:00 |
|
|
kevinz000
|
ebff6c9f38
|
compile, jump board crash to ground
|
2020-01-25 17:25:15 -07:00 |
|
|
kevinz000
|
443f1716e1
|
Merge remote-tracking branch 'citadel/master' into the-p-o-o-l
|
2020-01-25 17:04:37 -07:00 |
|
|
Putnam
|
11b5881721
|
wait no this should be 2
|
2020-01-24 09:15:43 -08:00 |
|
|
Putnam
|
0493db0ac6
|
allowed dojo banning, made dojo mobs dust upon leaving
|
2020-01-24 09:11:33 -08:00 |
|
|
kevinz000
|
cd0fc537b6
|
lgoic
|
2020-01-22 16:03:56 -07:00 |
|
|
kevinz000
|
5d485a95c3
|
Merge remote-tracking branch 'citadel/master' into the-p-o-o-l
|
2020-01-19 20:25:51 -07:00 |
|
|
Ghom
|
77911f9009
|
Merge pull request #10597 from Putnam3145/player-panel-can-reenter
Ghost role eligibility activation in player panel
|
2020-01-20 03:24:46 +01:00 |
|
|
kevinz000
|
90fcb4cc14
|
initial changes
|
2020-01-19 16:13:05 -07:00 |
|
|
Putnam
|
c612462b8c
|
some demodularization + new eligibility stuff
|
2020-01-18 03:39:27 -08:00 |
|
|
Putnam
|
6197920101
|
fixed unnecessary typecheck
|
2020-01-12 23:40:28 -08:00 |
|
|
Putnam
|
c7e3b167e2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into one-more-dojo-tweak
|
2020-01-12 17:40:26 -08:00 |
|
|
Putnam
|
bb0d012d7a
|
well that works
|
2020-01-12 16:08:49 -08:00 |
|
|
Lin
|
46420a693d
|
Merge branch 'master' into Ghommie-cit425
|
2020-01-07 00:28:37 +00:00 |
|
|
Ghommie
|
8c7b648a4f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit425
|
2020-01-05 17:42:54 +01:00 |
|
|
Putnam
|
f2759abb4c
|
fixed a runtime
|
2019-12-30 01:18:05 -08:00 |
|
|
Putnam
|
90ebbdfdb9
|
elements are so good. they're so good
|
2019-12-30 00:53:03 -08:00 |
|
|
Ghommie
|
dfa57173db
|
D'aww, a mistake...
|
2019-12-04 20:20:01 +01:00 |
|