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-16 21:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,604 Commits 55 Branches 0 Tags
901b93e534a880bb2b014dbbd5f80c149e6ec01a
Commit Graph

2851 Commits

Author SHA1 Message Date
silicons
f327592784 Update __donator.dm 2021-08-04 00:51:37 -07:00
Artur
5acd7fef2d makes salglu not deadly 2021-08-02 21:54:47 +03:00
Jay
a88e83e579 Adds military gas mask for donator 2021-08-01 18:42:43 -05:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
SandPoot
dbf3b3f057 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-28 14:22:48 -03:00
Putnam3145
975582380b always search when you change paths 2021-07-25 18:52:01 -07:00
Artur
2adfbea215 Merge remote-tracking branch 'origin/master' into fake_blood 2021-07-23 18:50:09 +03:00
SandPoot
86ad617daa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-22 12:40:18 -03:00
silicons
3070f178e0 Merge remote-tracking branch 'citadel/master' into combat_patches_1 2021-07-18 15:12:52 -07:00
SandPoot
3b119c132d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-02 11:22:41 -03:00
silicons
8710731b87 tweaks 2021-07-01 20:42:55 -07:00
Putnam3145
c253a2de86 alright how about these 2021-06-21 09:52:54 -07:00
SandPoot
91fd04c552 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-10 23:41:21 -03:00
LetterJay
3e29f0cccb Update __donator.dm 2021-06-06 20:36:01 -05:00
Jay
14fdfa80f5 pokerchip set donator item 2021-06-06 20:29:29 -05:00
WanderingFox95
9cdc45a905 Bit of this 2021-06-02 15:27:47 +02:00
WanderingFox95
b563e6c2e0 Splits Engineering and Security ORV Suits 2021-06-02 15:25:50 +02:00
SandPoot
283e2651eb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-23 16:52:37 -03:00
Lin
8d9571b863 Merge pull request #14735 from IgiariValkyr/IgiariDonatorFix 
Igiari Donator Item fix
 2021-05-23 14:16:59 -05:00
Igiari
ad6b6b29a0 I'm dumb 2021-05-20 20:08:07 -05:00
SandPoot
03bdaad203 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-19 15:55:34 -03:00
Igiari
1485b2fab5 I was told to do this too 2021-05-18 20:19:34 -05:00
Igiari
3de1291dcf Good suggest. 
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
 2021-05-18 17:45:55 -05:00
Igiari
27a779da01 It was supposed to be a uniform all along 
Fine, I'll fix it myself
 2021-05-18 13:02:45 -05:00
SandPoot
0313149d1c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-08 02:43:01 -03:00
Timothy Teakettle
5bc33c222a Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-08 01:28:23 +01:00
SandPoot
a9ae7d0930 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-07 15:58:07 -03:00
silicons
cd0a0bbe5c Update healing.dm 2021-05-06 03:02:46 -07:00
Artur
35bfba1f6a Redoes the variable changes into procs 2021-05-05 18:15:13 +03:00
Artur
92e6646a4c time to make blood even more pain 2021-05-05 14:44:21 +03:00
Timothy Teakettle
93254f5d9c Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-02 22:20:57 +01:00
Timothy Teakettle
d32770a0fa test 2021-05-02 22:19:41 +01:00
SandPoot
13e0116894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-29 11:09:28 -03:00
silicons
cb0574a560 Merge pull request #14649 from TheObserver-sys/BulletPass 
TRADE OFFER: YOU GIVE ME 30000 PLASMA. I GIVE YOU A SINGLE MAGAZINE OF 10MM INCINDIARY AMMO
 2021-04-28 21:17:55 -06:00
The0bserver
87eee1e15e Why do I do this to myself at 2:22 AM 2021-04-24 02:22:43 -04:00
The0bserver
00f50713eb The fault in my stars 2021-04-24 02:04:21 -04:00
The0bserver
42ed17d2af this too 2021-04-24 00:54:56 -04:00
The0bserver
c7b231637e boxes of ammo, also fire not weapon is bullet 2021-04-24 00:53:57 -04:00
The0bserver
aebca1767e In a station full of bad ideas, these costs were.. 2021-04-23 23:20:16 -04:00
necromanceranne
0a5b587304 Adds fake blindfolds. For reasons. 2021-04-21 12:06:34 +10:00
SandPoot
0165c4a7c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-10 12:34:59 -03:00
SandPoot
6f15641f33 Thirst (#151) 
* upload files

* upload files

* upload examine.dm

* Update modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
 2021-04-03 19:54:56 -03:00
Blue Wildrose
a7726aa383 re-enlarging the value 2021-04-01 06:07:25 -07:00
Blue Wildrose
e7099c67a1 oh right some fucker at cargo would abuse this. 2021-04-01 05:45:26 -07:00
SandPoot
73c0ff2f8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-24 23:57:03 -03:00
silicons
d58697c78d Merge pull request #14505 from timothyteakettle/the-most-important-pr 
the loadout now recognises collars as polychromic items
 2021-03-24 19:23:58 -06:00
SandPoot
afae5c3247 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-23 19:49:58 -03:00
Timothy Teakettle
7d4284b086 Update neck.dm 2021-03-23 21:33:50 +00:00
silicons
5910950a49 Merge pull request #14473 from ItzGabby/bark-box 
Bark Box Remastered Edition
 2021-03-22 21:15:14 -06:00
SandPoot
d789df5aa9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-20 18:15:07 -03:00