cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,291 Commits 55 Branches 0 Tags
54641ce2015f632b07e09f065abc119f677b7fed
Commit Graph

903 Commits

Author SHA1 Message Date
silicons
60a25981bc Merge pull request #12835 from kappa-sama/patch-36 
might fix necropolis chests turning up completely empty
 2020-07-22 02:31:21 -07:00
silicons
2f11fb6a8b ok 2020-07-21 11:59:39 -07:00
silicons
184e3992f3 fixes 2020-07-21 11:56:23 -07:00
kappa-sama
c92abfe2ce bruh 2020-07-20 21:18:39 -04:00
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
silicons
267186a5d3 Merge pull request #12646 from Chiirno/emi 
[READY] Alt-click cigarette pack functionality added to pill bottles.
 2020-07-20 16:15:38 -07:00
silicons
692656b02d Whew 2020-07-20 11:53:33 -07:00
kappa-sama
3676b03f28 experiment 2020-07-20 14:53:22 -04:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
Timothy Teakettle
1a5008fee7 Merge branch 'master' into wound-port 2020-07-18 23:06:49 +01:00
Lin
ba3dc6a73b Merge pull request #12679 from silicons/unarmed_parry 
Ok ok hear me out: Implements unarmed parry.
 2020-07-18 17:02:02 -05:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
silicons
93d669d205 Merge pull request #12759 from YakumoChen/hierophant-hugbox 
set hierophant friendly fire check to on by default
 2020-07-17 17:09:17 -07:00
Timothy Teakettle
93b4570f8d more changes 2020-07-17 23:23:47 +01:00
Timothy Teakettle
a4478b0cda it continues 2020-07-17 22:38:28 +01:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
silicons
e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0 
[READY]TGUI 3.0
 2020-07-16 17:28:42 -07:00
Artur
af65b626e3 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-16 15:56:08 +03:00
Letter N
819ca63456 https://github.com/tgstation/tgstation/pull/51679 - pickup_item missing 2020-07-16 20:42:02 +08:00
Letter N
9575c52b13 https://github.com/tgstation/tgstation/pull/52059 - the forgotten part 2020-07-16 20:21:39 +08:00
silicons
6121cbd091 Merge pull request #12738 from timothyteakettle/travelling-traders 
the travelling trader midround event
 2020-07-15 08:50:20 -07:00
Artur
f5ee74803f Updates minter to tg and the prereqs 2020-07-14 18:08:12 +03:00
Timothy Teakettle
8de062adbb fix 2020-07-13 19:46:51 +01:00
YakumoChen
072b4b673f set hierophant friendly fire to on by default 2020-07-13 09:40:58 +00:00
Timothy Teakettle
c1592ad162 more rewards 2020-07-11 23:27:29 +01:00
silicons
6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-07 21:07:58 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Trilbyspaceclone
b2dd2a1053 Update necropolis_chests.dm 2020-07-07 14:28:40 -04:00
Artur
280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Cirno
c2ba973c88 Merge remote-tracking branch 'origin' into emi 2020-07-04 15:59:47 -03:00
Cirno
020da9fa07 i hope this works 2020-07-04 15:47:38 -03:00
Ghommie
f5ffd7d2a9 Easing fine tuning of the system. 2020-07-03 03:00:33 +02:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
Ghommie
0779dd560e More and more fixes. 2020-06-29 18:52:37 +02:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +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
Trilbyspaceclone
4e1817d2be why were these tabs? 2020-06-17 03:22:29 -04:00
Trilbyspaceclone
4d9eeae268 Update necropolis_chests.dm 2020-06-17 03:08:52 -04:00
Trilbyspaceclone
51da7dfa71 Merge branch 'master' into spike-loot-differentces 2020-06-17 02:36:52 -04:00
Detective Google
fa5bae14f1 no 100% chance doomsday :^) 2020-06-13 22:14:23 -05:00
Trilbyspaceclone
51189d7a04 of copper and gold 2020-06-09 08:00:01 -04:00
TrilbySpaceClone
8b406df1ec mk III 2020-06-05 22:43:49 -04:00
TrilbySpaceClone
b62ef0f4e8 right... 2020-06-02 19:44:47 -04:00
Artur
19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00
Ghommie
1bca74465f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 03:29:02 +02:00
Ghom
16dea7ceed Revamped the paper wizard robes. (#12348) 
* Better paper wizard robes.

* return value.

* ooo

* Aaa

* aaaa
 2020-05-27 18:01:22 -07:00