cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,737 Commits 5 Branches 0 Tags
a2a2f58e93c0a47a4c657e6edfe6dd9ebbaad19c
Commit Graph

31737 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hubblenaut
2c92802db5 Adds a verb for toggling specific pieces of underwear 2016-08-12 20:58:40 +02:00
Anewbe
83c515fdd9 Merge pull request #2305 from Yoshax/bugifx20 
Fixes #2303
 2016-08-11 21:17:25 -05:00
Yoshax
2163998e2f Fixes #2303 2016-08-12 03:07:16 +01:00
Eearslya
4eb140ed7f Fix atmo_control interface temperature reading 2016-08-11 18:05:29 -07:00
Neerti
96536a7176 Merge pull request #2297 from Yoshax/bugfixboogalo 
Minor Bug Fix Boogalo
 2016-08-11 18:42:00 -04:00
Anewbe
43e8bf8336 Merge pull request #2300 from Yoshax/cargomap 
Fixes cargo not having fifty stack sheets on spawn
 2016-08-11 16:54:48 -05:00
Yoshax
e4dc0f2209 Fixes #2050 2016-08-11 22:18:10 +01:00
Yoshax
b72410cdef Fixes #2254 2016-08-11 22:04:57 +01:00
Yoshax
7e5b4e4221 Fixes cargo not having fifty stack sheets on spawn 2016-08-11 18:02:59 +01:00
Yoshax
f63ee31523 Removes Captain as a title, sets default to Station Administrator, and adds a new title, Site Manager 2016-08-11 15:30:45 +01:00
Yoshax
faf0555022 Adds changelog 2016-08-11 00:34:38 +01:00
Yoshax
3ded74a297 Fixes #2266 2016-08-11 00:29:51 +01:00
Yoshax
c930d71cce Fixes #2286 2016-08-10 23:56:52 +01:00
Yoshax
733450f46b Fixes #2271 2016-08-10 23:48:02 +01:00
SinTwo
7248d4a81d stationtime fix 2016-08-10 18:34:00 -04:00
Anewbe
3cb36d8a73 Merge pull request #2295 from Yoshax/removemimiccrate 
Removes mimic crate from maintenance
 2016-08-10 16:18:00 -05:00
Yoshax
dd41cca9b6 Removes mimic crate from maintenance 2016-08-10 18:49:38 +01:00
SinTwo
f50adb9554 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade 
Conflicts:
	code/_helpers/time.dm
	code/modules/economy/ATM.dm
 2016-08-09 15:46:24 -04:00
Anewbe
25bcc0fe61 Merge pull request #2293 from PolarisSS13/revert-2288-lungruptuing 
Revert "Fixes lung rupturing"
 2016-08-09 10:10:19 -05:00
Yoshax
6e2d7587ad Revert "Fixes lung rupturing" 2016-08-09 15:41:10 +01:00
Kelenius
763c7376d4 Roboticists now can access bots. 2016-08-09 07:10:16 +03:00
Yoshax
8c363c1ecb Merge pull request #2290 from Yoshax/changelog 
Update changelog
 2016-08-08 23:16:50 +01:00
Yoshax
53c898ebec Update changelog 2016-08-08 23:16:20 +01:00
Anewbe
16f18b10a7 Merge pull request #2288 from Yoshax/lungruptuing 
Fixes lung rupturing
 2016-08-08 17:13:38 -05:00
Anewbe
e6652ad357 Merge pull request #2289 from Yoshax/lingreviveimprove 
Ensures that changeling revive closes surgical incisions
 2016-08-08 16:04:57 -05:00
Yoshax
052c929267 Adds changelog 2016-08-08 21:10:18 +01:00
Yoshax
0ca2cc714b Ensures that changeling revive closes surgical incisions so they do not bleed to death 2016-08-08 21:08:15 +01:00
Yoshax
daa49ced44 Shamelessly steals HarpyEagle's code 2016-08-08 20:45:53 +01:00
Yoshax
ca31fecbc2 Merge pull request #2284 from Kelenius/fuckCael 
Rewrites xenoarch
 2016-08-08 19:00:13 +01:00
Kelenius
d0a0a64722 Merge branch 'master' into fuckCael 2016-08-08 18:41:18 +03:00
Yoshax
adb74bfe78 Adds changelog 2016-08-08 15:50:21 +01:00
Yoshax
e9e51ccb02 Fixes lung rupturing 2016-08-08 15:47:53 +01:00
Neerti
1a27f41076 Merge pull request #2282 from Yoshax/low-end-combat 
Item force tweaks
 2016-08-08 07:24:24 -04:00
EmperorJon
0be1856574 Merge pull request #2287 from PolarisSS13/revert-2278-8/6/2016_hub_time 
Off the Hub for another two weeks.
 2016-08-08 11:22:12 +01:00
EmperorJon
8110fbbf3c Merge pull request #2232 from SinTwo/scheduler 
510 scheduler
 2016-08-08 10:36:36 +01:00
Neerti
f77b5938d9 Revert "Puts server on the hub once again." 2016-08-08 03:18:05 -04:00
Anewbe
06885e75ab Merge pull request #2285 from Yoshax/changelog 
Updates changelog
 2016-08-07 15:46:54 -05:00
Yoshax
48cc650667 Updates changelog 2016-08-07 21:38:19 +01:00
Yoshax
058b6f1aa3 Further weapon force tweaks 2016-08-07 15:00:25 +01:00
Kelenius
93d07036ef Rewrites xenoarch 
See changelog
 2016-08-07 08:26:26 +03:00
Yoshax
60c4fb436c no message 2016-08-07 01:39:55 +01:00
Yoshax
ad2df49989 Adds changelog 2016-08-07 01:35:12 +01:00
Yoshax
403c9adcdb Low/er end combat force adjustments 2016-08-07 01:31:45 +01:00
Neerti
7907de5974 Merge pull request #2173 from Yoshax/telecrystalfun 
Adds telecrystal teleporting
 2016-08-06 20:23:50 -04:00
Neerti
2d60868be9 Merge pull request #2281 from Anewbe/burns_bleed 
Severe burns cause bloodloss
 2016-08-06 20:22:45 -04:00
Anewbe
1e0dccd137 Severe burns cause bloodloss 2016-08-06 19:06:00 -05:00
Yoshax
623cb52e84 Grammar typo fix 2016-08-07 00:51:33 +01:00
Neerti
8241370548 Merge pull request #2227 from Yoshax/mapping 
Adds a new maintenance tunnel
 2016-08-06 19:33:46 -04:00
Neerti
4b5d08a0d7 Merge pull request #2280 from Yoshax/whitelist 
Ensures xeno loadout validation is done correctly
 2016-08-06 19:27:39 -04:00
Yoshax
fe8d1b24af Ensures xeno loadout validation is done correctly 2016-08-06 20:27:23 +01:00