cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,922 Commits 6 Branches 0 Tags
fe32372f74d01227bf00017fc133233b51f9ce75
Commit Graph

828 Commits

Author SHA1 Message Date
Belsima
18346b864a The new default for 'if you don't get your job' is assistant. 2017-09-18 10:15:06 -04:00
Belsima
cc712ed20e Adds a new hud & removes red crosses from huds. (#3846) 
* Adds a new hud & removes red crosses from huds.

* Changeling.

* i missed a comma
 2017-09-17 19:07:32 -05:00
Belsima
fb0e4d3cf9 General uniform updates. (#3814) 
* General uniform update.

* Maps in bathrobe.

* Revert "Maps in bathrobe."

This reverts commit 9cbe47671da7a452cb5ac040aeefdcb98dbe180a.

* Fixes cheongsams and maps in the bath robe.

* Removes unintentionally added sprite.

* Assorted bugfixes.
 2017-09-15 17:14:20 -05:00
Belsima
7359c6f7a6 Fixes up the PR. 2017-09-09 23:17:41 -04:00
Belsima
022eb8cf4c Standardizes spellings to wiki and adds more major corps and places to setup. 2017-09-09 12:20:08 -04:00
Anewbe
3650fb1562 Merge pull request #3699 from Belsima/master 
A load of Teshari stuff: For Real This Time
 2017-08-16 22:53:00 -04:00
Anewbe
ad4b439e96 Merge pull request #3680 from Neerti/8/4/2017_arrivals 
Makes Arrivals Shuttle Great
 2017-08-14 21:59:18 -04:00
Belsima
cb7b9ca64e please don't get mad at me github 2017-08-10 16:12:29 -04:00
Belsima
d4e3b4453d A load of Teshari stuff: For Real This time 2017-08-10 16:12:16 -04:00
PrismaticGynoid
1f1f537e1c Better Wheelchairs 
Wheelchairs can now be collapsed by click-dragging them to you, much like rollerbeds. You can then pick them up. They are, however, too large to stuff into a backpack.
These new collapsible wheelchairs are now available in the loadout, under utility, for 4 points. They're also color-customizable now. No more plain white wheelchairs available only by missing feet.
The loadout wheelchairs will spawn with you buckled into them, just like how it works when you spawn without feet, except that the loadout wheelchairs can be more colors than just white.
 2017-08-09 00:48:13 -07:00
Neerti
9d98406833 Makes Arrivals Shuttle Great 
Arrivals shuttle now moves automatically to and from the station.  People still spawn onboard if they join the round with arrivals selected in preferences.
The shuttle is completely automated and will go to the station if someone boards it, and leave if nobody is onboard.
Changes some tape code so it can be mapped in.
Sadly the mapmerger is broken so the map file diff is massive.
 2017-08-05 15:18:55 -04:00
Cameron653
97957fcaee Replaces more macros. (#3647) 
* MORE MACRO CHANGES

AHHHHHHHHHHHHHHHHHHHH

* Fixes a few typos

* Fixes compile error

* Fixes for real

* 4 macros left that I can't find
 2017-07-27 21:12:21 -05:00
Neerti
139d397a47 Merge pull request #3578 from Anewbe/surgical_caps 
Adds surgical caps to the loadout
 2017-07-23 17:42:51 -04:00
Anewbe
d7875f5377 Merge pull request #3609 from Belsima/legwarmers 
Adds a load of zippos to the loadout.
 2017-07-18 16:27:09 -05:00
Anewbe
b22a9fa575 Merge pull request #3589 from Belsima/gloves 
Adds fingerless gloves.
 2017-07-17 15:42:28 -05:00
Belsima
a291ae9889 Adds a load of zippos to the loadout. 2017-07-17 14:57:14 -04:00
Anewbe
4e93ac107f Merge pull request #3584 from Belsima/pens 
Adds a fountain pen.
 2017-07-11 11:24:27 -05:00
Belsima
e51de25dea Adds fingerless gloves. 2017-07-11 00:49:02 -04:00
Belsima
1d7cea9864 renames a mislabelled pen 2017-07-10 18:07:07 -04:00
Belsima
b7a34a3645 Adds a gilded pen. 2017-07-10 18:01:43 -04:00
Belsima
c0d22058b4 Adds a boatload of sweaters. 2017-07-10 17:49:22 -04:00
Anewbe
c64f7c9fa3 Merge pull request #3505 from Dhaeleena/Somecat 
Winter boots
 2017-07-09 17:13:27 -05:00
Anewbe
07c82963c9 Adds surgical caps to the loadout 2017-07-09 16:18:52 -05:00
Neerti
beccda6866 Makes automute less prone to mute cultists. 2017-07-04 23:20:44 -04:00
Yoshax
020c1d7d88 Adds material scanner and prescription ones to loadout 2017-06-30 23:56:44 +01:00
Anewbe
81e7d9ce42 Merge pull request #3513 from Belsima/snowsuit 
Adds snowsuits.
 2017-06-25 16:27:43 -05:00
Belsima
a62c91ebd3 Appeases the mergelords. 2017-06-16 20:27:08 -04:00
Anewbe
94522eb04f Merge pull request #3503 from MatchaFrappe/master 
Adds a sexy maid uniform~!
 2017-06-14 17:31:39 -05:00
Belsima
11ceb9e92f Adds snowsuits. 
Also fixes department jacket access.
 2017-06-08 10:02:30 -04:00
PsiOmegaDelta
ebe5cc916d Port of @PsiOmegaDelta's Baystation12/Baystation12#16820 
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
 2017-06-05 22:10:06 -04:00
Dhaeleena
7f773b0099 Adds Winter boots for every department! Adds said boots to the loadout. Adds boots to all the closets and wardroves that had winter jackets. Adds boots and jackets to some closets that had neither and fitted in. 2017-06-05 16:46:54 -03:00
MatchaFrappe
68310de0ae Update loadout_uniform.dm 2017-06-05 17:06:32 +10:00
Leshana
b17fb86721 Tweaks Statpanel and System Initialization 2017-06-01 21:42:08 -04:00
Anewbe
1633c32c99 Merge pull request #3478 from Bromuzl/Bromuzl-High-topsLoadout 
High-tops loadout
 2017-05-29 13:11:57 -05:00
Bromuzl
48f668de95 Adds ported high-tops to loadout 
Extends the high-top port to load-outs,
 2017-05-27 04:38:15 -05:00
Schnayy
b1cb74b318 Adds 4 new clothing sprites & puts them in the loadout. 
Peacoats: Requested.

Black corset/skirt combo: Requested.

Flower dress: First ss13 sprite I made, threw it in.

Red swept dress: A new, nicer red dress.
 2017-05-22 18:08:01 -05:00
Cerebulon
0ce6ca7290 Cleans up uniform loadout menu. 
Suits are now mostly under one-piece (subtypes of 'lawyer') and modular (subtypes of 'suit_jacket') selection menus. Croptops also under selection menu.
 2017-05-08 00:31:31 +01:00
Anewbe
3b82b75f83 Merge pull request #3396 from Cerebulon/skirtsuits 
Adds 24 new skirt versions of suit sprites.
 2017-05-05 21:55:14 -05:00
Cerebulon
36decd20b7 Adds icons. Adds skirts to loadout options and closets. 2017-04-30 02:39:27 +01:00
Cerebulon
339b269393 Adds 23 new skirt versions of existing suit sprites. 
Adds them to loadout options and departmental uniform lockers as appropriate.
One new (Old Woman Attire) as equivalent to old man suit.
Some are unused, but now skirt sprites exist.
 2017-04-29 12:01:40 +01:00
Anewbe
b7751bab10 Changelog, adds the dicecup to the loadout 2017-04-17 12:44:34 -05:00
Arokha Sieyes
42998da918 Fix 'if' statement on Panic Bunker 
Prints error message when it doesn't need to and works fine. Also moves check up slightly to prevent an exploit.
 2017-04-11 00:13:54 -04:00
Arokha Sieyes
66327aecc7 Quick & Dirty Panic Bunker Port 
Tested on our server, works. Doesn't work if you don't have a DB (how would it?).
 2017-04-11 00:13:43 -04:00
Anewbe
4a33a8df82 Merge pull request #3216 from Neerti/3/22/2017_the_empress_protects 
Implements the new Codex.
 2017-04-08 13:02:43 -05:00
Neerti
a4a05ae4ec Implements the new Codex. 2017-04-08 12:08:08 -04:00
Anewbe
e9c4b5a3eb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things 
# Conflicts:
#	icons/mob/back.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
 2017-04-07 16:11:50 -05:00
Anewbe
6a95f6c87f Merge branch 'master' into apron_pockets 2017-04-04 17:54:38 -05:00
Anewbe
b38986b4b7 Merge pull request #3209 from Atermonera/master 
FBPs can have numbers in their names.
 2017-04-03 13:56:06 -05:00
Atermonera
67d9f03e4d FBPs can have numbers in their names. 2017-04-02 13:53:49 -07:00
Anewbe
8e9db2b7d4 Aprons now have pockets 2017-04-02 00:28:20 -05:00