cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-21 12:17:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
32,351 Commits 10 Branches 0 Tags
85c3e228738a3db687f59cdcdc618b28ff00d4bf
Commit Graph
32351 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eearslya 85c3e22873 Polaris sync 2016-08-06 20:34:44 -07:00
NeertiandGitHub 7907de5974 Merge pull request #2173 from Yoshax/telecrystalfun 
Adds telecrystal teleporting
 2016-08-06 20:23:50 -04:00
NeertiandGitHub 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
NeertiandGitHub 8241370548 Merge pull request #2227 from Yoshax/mapping 
Adds a new maintenance tunnel
 2016-08-06 19:33:46 -04:00
NeertiandGitHub 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
YoshaxandGitHub 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
SpookertonandGitHub c407534a3e Merge pull request #2276 from PolarisSS13/revert-2263-frame_cleanup 
Revert "Frame Cleanup" (Testing is for the weak)
 2016-08-06 00:56:46 +01:00
YoshaxandGitHub 82722ba42f Revert "Frame Cleanup" 2016-08-06 00:27:03 +01:00
AnewbeandGitHub 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
YoshaxandGitHub 3ef4dad6ea Merge pull request #2273 from Yoshax/changelogz 
Updates changelog
 2016-08-05 21:25:46 +01:00
Yoshax 8475ace4b0 Fix broken entry 2016-08-05 21:19:29 +01:00
Yoshax 469275daa6 Updates changelog 2016-08-05 21:16:52 +01:00
EmperorJonandGitHub 9b8a970744 Merge pull request #2269 from Yoshax/xenoloadout 
Fixes loadout sanitisation setup stuff or something
 2016-08-05 21:15:34 +01:00
YoshaxandGitHub afa7878abb Merge pull request #2263 from SinTwo/frame_cleanup 
Frame Cleanup
 2016-08-05 21:14:35 +01:00
YoshaxandGitHub ed435b649e Merge pull request #2270 from Screemonster/AI_holograms 
Additional hologram sprites for the AI
 2016-08-05 21:10:14 +01:00
YoshaxandGitHub 2b8d2356f9 Merge pull request #2267 from Woodratt/1.5.7_OutpostRework 
1.5.7 Outpost Rework
 2016-08-05 19:28:18 +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
PsiOmegaDeltaandYoshax 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
Yoshax 3f238f471a Adds changelog 2016-08-05 17:37:48 +01:00
PsiOmegaDeltaandYoshax 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
NeertiandGitHub a2e50d05ec Merge pull request #2238 from Yoshax/dufflebags 
Adds "syndicate" dufflebags to the uplink
 2016-08-05 11:56:27 -04:00
woodratt b98aef7974 1.5.7 Outpost Rework 
- Research outpost dock airlock buttons fixed to the correct tag.
- Engineering Outpost moved to the same z-level as the mining and research ones.
- Research outpost isolation rooms have their proper areas.
- Framework for a drydock added to the Engineering outpost.
 2016-08-04 16:13:10 -07:00
YoshaxandGitHub fd78072f92 Merge pull request #2264 from Anewbe/fire_hot 
Fire hurts
 2016-08-04 23:18:59 +01:00
Anewbe e2946be7d2 Adds changelog 2016-08-04 15:33:39 -05:00
SpadesandGitHub e89dce2484 Merge pull request #442 from VOREStation/sec-checkpoint 
Security checkpoint added by vault.
 2016-08-04 09:58:50 -04:00
Anewbe 4ce94fbaed Fire hurts 2016-08-03 21:12:16 -05:00
YoshaxandGitHub 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
AnewbeandGitHub 647d37458c Merge pull request #2239 from Yoshax/pricing 
Uplink pricing adjustments
 2016-08-03 12:47:57 -05:00
Spades cce4568fe0 Conflict resolution. 2016-08-02 21:36:54 -04:00
Spades b0dc0f1c9e Merge remote-tracking branch 'refs/remotes/origin/master' into sec-checkpoint 
# Conflicts:
#	maps/virgo-1.dmm
 2016-08-02 21:32:28 -04:00
Spades e157852d7a Security checkpoint added by vault. 2016-08-02 21:19:13 -04:00
AnewbeandYoshax 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
YoshaxandGitHub a4d38d6374 Merge pull request #2249 from redstryker/clothes 
Adds Customs Clothes, Vests, and Sweaters, Oh My!
 2016-08-02 18:40:17 +01:00
HubblenautandYoshax 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
EmperorJonandGitHub 7aac528a4a Merge pull request #2255 from Anewbe/null_armor 
Makes Overload actually ignore armor
 2016-08-02 13:47:44 +01:00
EmperorJonandGitHub 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
AnewbeandGitHub 586cbee219 Merge pull request #2256 from Yoshax/mysoulbleeds 
Removes embedded objects causing toxin damage when moved
 2016-08-01 22:07:07 -05: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
SpookertonandGitHub 1c4ecc7dd5 Merge pull request #2250 from Yoshax/mysoulbleeds 
Makes wounds actually bleed
 2016-08-01 21:36:13 +01:00