cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,679 Commits 8 Branches 0 Tags
eabefc538a2cf176eb619ef64daf1600aa4e674a
Commit Graph

14492 Commits

Author SHA1 Message Date
SinTwo
eabefc538a Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade" 
This reverts commit 6bb5409349, reversing
changes made to f6a83d5ee0.
 2016-08-15 12:58:00 -04:00
SinTwo
6bb5409349 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade 
Conflicts:
	code/modules/admin/holder2.dm
 2016-08-15 12:26:53 -04:00
Hubblenaut
10391e5f3b Bottles will now sell for their set prices. 2016-08-15 15:32:28 +02:00
EmperorJon
f6a7d068d5 Merge pull request #2314 from Anewbe/taj_cleanup 
Taj cleanup
 2016-08-15 11:32:05 +01:00
EmperorJon
2810683110 Merge pull request #2319 from ColaFiend/master 
Minor text fixes.
 2016-08-15 10:04:08 +01:00
EmperorJon
4a11ea2283 Merge pull request #2308 from Hubblenaut/master 
Adds a verb for toggling specific pieces of underwear
 2016-08-15 09:50:26 +01:00
Brightdawn~
b5eec907c0 Minor text fixes. 
Changes description of rainbow shoes.

Adds description for:
Potted Plant
Plating
 2016-08-15 06:31:42 +01:00
Yoshax
5426efcb39 Fixes valid_species having datums 2016-08-14 17:14:26 +01:00
PsiOmegaDelta
de6d2a4a31 Fixes check_rights runtiming for non-holders. 
Fixes all kinds of errors.
 2016-08-14 16:10:39 +01:00
Yoshax
cfaada473b Fixes change appearance not working for other species 2016-08-14 16:10:07 +01:00
Anewbe
aa81925b71 Adds Changelog 2016-08-13 23:18:51 -05:00
Anewbe
0cb1f8c27a Cleans up the code to match recent Tajaran rewrite 2016-08-13 23:07:00 -05:00
Neerti
4e37d71657 Merge pull request #2291 from Kelenius/botAccess 
Roboticists now can access bots.
 2016-08-13 20:24:35 -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
e4dc0f2209 Fixes #2050 2016-08-11 22:18:10 +01:00
Yoshax
b72410cdef Fixes #2254 2016-08-11 22:04:57 +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
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
8110fbbf3c Merge pull request #2232 from SinTwo/scheduler 
510 scheduler
 2016-08-08 10:36:36 +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
403c9adcdb Low/er end combat force adjustments 2016-08-07 01:31:45 +01: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
fe8d1b24af Ensures xeno loadout validation is done correctly 2016-08-06 20:27:23 +01: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
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
Anewbe
4ce94fbaed Fire hurts 2016-08-03 21:12:16 -05:00