cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,620 Commits 8 Branches 0 Tags
9e4d4752acc7a03a5b872f7c2f70a5233adff053
Commit Graph

23602 Commits

Author SHA1 Message Date
SinTwo
9e4d4752ac cleanup 2016-08-14 20:46:04 -04: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
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
Anewbe
4ce94fbaed Fire hurts 2016-08-03 21:12:16 -05:00
Yoshax
83ee9b6a75 Merge pull request #2262 from SinTwo/item_icon_fixes 
Icon Fixes
 2016-08-03 19:32:20 +01:00
Yoshax
89956eaaae Merge branch 'master' of https://github.com/PolarisSS13/Polaris into dufflebags 
# Conflicts:
#	code/datums/uplink/tools.dm
 2016-08-03 19:30:02 +01:00
SinTwo
279cbdfafe more icon fixes 2016-08-03 14:10:29 -04:00
SinTwo
07b4eb2d95 final fixes, tweaks, and cleanups 2016-08-03 14:09:12 -04:00
Anewbe
647d37458c Merge pull request #2239 from Yoshax/pricing 
Uplink pricing adjustments
 2016-08-03 12:47:57 -05:00
Anewbe
88b7f0e678 Fixes does_not_breathe, Toggle breathing is an active power (#2240) 
* Fixes does_not_breathe

* Fixes things, Changelings can toggle breathing

* Changelog
 2016-08-02 18:41:24 +01:00
Yoshax
a4d38d6374 Merge pull request #2249 from redstryker/clothes 
Adds Customs Clothes, Vests, and Sweaters, Oh My!
 2016-08-02 18:40:17 +01:00
Hubblenaut
044a677ab0 Construction Tweaks and Fixes (#2253) 
* Fixes reinforced Walls construction

when having one sheet left in the stack

* Amends Windoors

 - Assemblies are now made with two sheets of either normal or reinforced
   glass sheets, for normal and secure windoors respecting.
 - Assemblies can now be named with a pen, just like airlocks.
 - Windoor assemblies now get placed like windows, and windows take
   windoor assemblies into account when placed.
 - Decapitalises windoor assembly names.
 - Shattering windoors will make them drop exactly what they were made of
   now.
 - Prying emagged windoors will no longer make them shatter on top of
   returning to an assembly.
 - Cleans up a lot of code and gets its own update_icon() proc.

* Amends airlocks

 - Fixes airlocks occasionally not updating their icon correctly.
 - Fixes airlocks causing sparks on spawn as if they were damaged.
 - Fixes airlock not being anchored after being turned into an assembly.
 - Decapitalises airlock names.

* Windows that get unanchored by force will now correctly have the rotate verb.

* Adds changelog entry
 2016-08-02 18:39:22 +01:00
EmperorJon
7aac528a4a Merge pull request #2255 from Anewbe/null_armor 
Makes Overload actually ignore armor
 2016-08-02 13:47:44 +01:00
EmperorJon
16d2bd397a Merge pull request #2257 from Anewbe/cooler_fix_1 
Should remove flickering heat warning for FBPs in suit coolers
 2016-08-02 10:29:41 +01:00
Anewbe
6423aa6330 Should remove flickering heat warning for FBPs and suit coolers 2016-08-01 22:06:26 -05:00
Yoshax
221a245e0d Removes embedded objects causing toxin damage when moved 2016-08-02 02:55:10 +01:00
Anewbe
703a98ed60 Makes overload actually ignore armor 2016-08-01 18:20:16 -05:00
Yoshax
2047eefa73 Makes wound bleed again 2016-08-01 21:13:16 +01:00