cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,723 Commits 6 Branches 0 Tags
fa92cdeeda4574b494d1dbdbb59ae50f50c14c37
Commit Graph

23668 Commits

Author SHA1 Message Date
SinTwo
045c393683 Revert "Revert "Frame Cleanup"" 
This reverts commit 82722ba42f.
 2016-08-13 19:55:57 -04:00
Yoshax
b2ba310df0 Fixes dirt 2016-08-13 15:30:20 +01:00
Neerti
730b6c58da Merge pull request #2154 from Yoshax/secretisdumbasshit 
Makes secret not bad
 2016-08-12 17:15:14 -04:00
NullSnapshot
06ddbfc98d gets rid of unneeded code in adminpaper 
minor change to paper.dm fixes the issue adminpaper needed the code in.
 2016-08-12 21:58:15 +01:00
Yoshax
de38b055b4 Adds ability to put the SolGov logo on the admin faxes 2016-08-12 21:58:08 +01:00
NullSnapshot
e987e2f0c4 allows check_rights to accept either mobs or clients. 2016-08-12 21:48:52 +01:00
NullSnapshot
3345ac5cd1 gets rid of some text macros. 2016-08-12 21:36:17 +01:00
NullSnapshot
d81bfe3c3e adds footer and changes fax challenge to an md5 of the game ID. 2016-08-12 20:07:15 +01:00
NullSnapshot
e881c77c8f refactors admin faxes to allow for more simple to use fax creation and replying. 
Admins also gain the ability to initiate faxes.
And mods can send and receive faxes now.
 2016-08-12 19:58:52 +01:00
Hubblenaut
2c92802db5 Adds a verb for toggling specific pieces of underwear 2016-08-12 20:58:40 +02:00
Yoshax
2163998e2f Fixes #2303 2016-08-12 03:07:16 +01: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
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
733450f46b Fixes #2271 2016-08-10 23:48:02 +01:00
SinTwo
7248d4a81d stationtime fix 2016-08-10 18:34:00 -04: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
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
Anewbe
16f18b10a7 Merge pull request #2288 from Yoshax/lungruptuing 
Fixes lung rupturing
 2016-08-08 17:13:38 -05: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
Kelenius
d0a0a64722 Merge branch 'master' into fuckCael 2016-08-08 18:41:18 +03: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
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
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
Yoshax
fe8d1b24af Ensures xeno loadout validation is done correctly 2016-08-06 20:27:23 +01:00
Yoshax
eff90ea309 Merge pull request #2278 from Neerti/8/6/2016_hub_time 
Puts server on the hub once again.
 2016-08-06 15:22:25 +01:00
Neerti
b1ba55713d Puts server on the hub once again. 2016-08-06 09:58:57 -04:00
Yoshax
82722ba42f Revert "Frame Cleanup" 2016-08-06 00:27:03 +01:00
Anewbe
9f7b77d933 Merge pull request #2274 from SinTwo/miscfixes 
Minor Fixes
 2016-08-05 16:35:09 -05:00
SinTwo
a17d42a84c mode name and ert sechud fix 2016-08-05 16:27:07 -04:00
EmperorJon
9b8a970744 Merge pull request #2269 from Yoshax/xenoloadout 
Fixes loadout sanitisation setup stuff or something
 2016-08-05 21:15:34 +01:00
Yoshax
afa7878abb Merge pull request #2263 from SinTwo/frame_cleanup 
Frame Cleanup
 2016-08-05 21:14:35 +01:00
Yoshax
ed435b649e Merge pull request #2270 from Screemonster/AI_holograms 
Additional hologram sprites for the AI
 2016-08-05 21:10:14 +01:00
Screemonster
c59a41c830 Adds ian, runtime, poly, pun pun, and generic human, unathi, tajara, tesharii and skrell sprites to the list of hologram options. 2016-08-05 18:02:28 +01:00
PsiOmegaDelta
0f830b0f98 no message 2016-08-05 17:58:15 +01:00
Yoshax
77dda80477 Removes whitelist taj from furs and mantle 2016-08-05 17:38:08 +01:00
PsiOmegaDelta
4d74a8f5c2 Various fixes. 
Client Login() now calls ..() before setting up preferences, ensuring a mob has actually been assigned. Fixes #12560 (and probably other somehow subtle sanitation issues).
The alien whitelist now checks the rights of the supplied mob, not usr.
When granting xeno loadout gear the mob's current species must match the gear's whiteliste species.
 2016-08-05 17:35:43 +01:00
Neerti
a2e50d05ec Merge pull request #2238 from Yoshax/dufflebags 
Adds "syndicate" dufflebags to the uplink
 2016-08-05 11:56:27 -04:00