cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 17:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,042 Commits 2 Branches 1 Tag
b7059519c24f23434de734b3370dbeeb3f25b072
Commit Graph

11948 Commits

Author SHA1 Message Date
Segrain
b7059519c2 Merge remote-tracking branch 'upstream/master' into dev 2014-02-03 04:36:03 +03:00
Chinsky
743c8ec18e Merge pull request #4372 from Segrain/master 
Small fixes.
 2014-02-02 03:12:45 -08:00
RavingManiac
a750ca5c0d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-02-02 16:04:37 +08:00
RavingManiac
30915b5ba4 Escape shuttle modified after feedback. 
Wall emergency lockers now contain two breath masks and two emergency oxygen tanks.

Emergency ration crates contain two boxes of donk-pockets. The escape shuttle has two crates at the back.
 2014-02-02 16:04:11 +08:00
Segrain
0e2ff8b00b Fix for #4011. 2014-02-02 02:34:30 +03:00
Segrain
88e7dbb67f Fix for mods counting. 2014-02-02 02:33:53 +03:00
Ccomp5950
0980493981 Merge pull request #4368 from Loganbacca/prefs 
Character setup underwear rendering
 2014-02-01 14:58:38 -08:00
Ccomp5950
d38af0c44b Typo fix: corpotate -> corporate. 
And superfluous U removal 'MURIKA!
 2014-02-01 15:25:00 -06:00
Zuhayr
e79fb1d890 Merge pull request #4366 from RKF45/dough 
Reintroducing the dough-based cooking system.
 2014-02-01 05:13:10 -08:00
Chinsky
3a913e426c Merge pull request #4360 from RKF45/dev 
I am doing that just for genetecists wearing monkey suits.
 2014-02-01 03:33:54 -08:00
Chinsky
79fd66c685 Merge pull request #4364 from Loganbacca/collars 
Suit collars
 2014-02-01 03:30:36 -08:00
RKF45
4b6dc4d257 Diona roasts needs cooperation for acid 2014-02-01 11:16:55 +01:00
Loganbacca
6bf6f6d849 Added underwear rendering to character setup screen 
Also culled unused underwear names from global_lists.dm
 2014-02-01 17:53:13 +13:00
RKF45
8fbcda2a0b Reintroducing the dough-based cooking system. 2014-02-01 02:17:38 +01:00
Loganbacca
44498dc5eb Tail rendering fix 
Spotted this while working on collars code
Moved tail layer before hand layers, so tails don't render over held items
 2014-02-01 13:30:18 +13:00
Loganbacca
c6964b1a1a Cleaned collar rendering code 
Removed colon
Removed need for collar variable
Corrected TOTAL_LAYERS define
 2014-02-01 13:25:09 +13:00
Ccomp5950
e72c824b90 Deadchat sanitized so players can't use HTML. 2014-01-31 16:41:12 -06:00
DJSnapshot
810de4ddaa Merge pull request #4337 from Baystation12/dev-freeze 
0.1.8 Staging [Do not merge]
 2014-01-31 12:40:15 -08:00
Segrain
ece3556143 Smallfix. 2014-01-31 16:31:17 +03:00
Segrain
4df59faf76 Surgery tracking. 2014-01-31 16:28:24 +03:00
Segrain
93a29c60b3 Verb category. 2014-01-31 16:22:31 +03:00
Segrain
4e17dc0b93 Sanity checks. 2014-01-31 16:21:05 +03:00
Segrain
4c87838e64 Double call removal. 2014-01-31 16:19:22 +03:00
Loganbacca
41dccddbef Suit collars 
Adds a collar overlay above the helmet layer if the suit has one
Suit needs an identically named sprite in icons/mob/collar.dmi
Suit also needs 'collar = 1' set in utility.dm

Trenchcoats are go!
 2014-02-01 02:17:52 +13:00
Ccomp5950
8c5c5fb868 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-01-31 06:26:20 -06:00
RKF45
2be33b8713 Typo 2014-01-31 08:36:56 +01:00
Segrain
b9b6a6d5be Check for verb removal. 2014-01-31 00:31:41 +03:00
Segrain
9fdd34b1ba Removal of double reporting. 2014-01-31 00:28:25 +03:00
RKF45
003dd117f2 New preferences 2014-01-30 22:27:47 +01:00
Segrain
9a70dd3d13 Objectives fix. 2014-01-31 00:25:44 +03:00
Segrain
75c88634f7 Definition usage. 2014-01-31 00:22:24 +03:00
Ccomp5950
f208f05534 Merge pull request #4356 from Loganbacca/bayfix-devfreeze 
Non-standard dropped item layer bug
 2014-01-30 10:59:38 -08:00
Ccomp5950
f136fa1db2 Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev 
Conflicts:
	icons/mob/mask.dmi
 2014-01-30 12:56:23 -06:00
Ccomp5950
7962bd3277 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/supermatter/supermatter.dm
	maps/tgstation2.dmm
 2014-01-30 12:44:33 -06:00
Zuhayr
09ac26818d Merge pull request #4358 from SueTheCake/armors 
Tactical Armor Storage + Tac Armor REDUX
 2014-01-30 10:33:46 -08:00
Ccomp5950
975433f898 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	icons/mob/back.dmi
	icons/mob/mask.dmi
 2014-01-30 12:14:44 -06:00
Ccomp5950
9f0792ac1a Merge pull request #4352 from Zuhayr/dev 
Species changes and icons.
 2014-01-30 09:37:15 -08:00
Zuhayr
f08e6c804d Rogue comma, kill it. 2014-01-30 23:33:57 +10:30
Zuhayr
2f36fb79bc Fixes #4078 2014-01-30 23:31:50 +10:30
Zuhayr
8850a43dcb Fixes #3847 2014-01-30 23:21:00 +10:30
Zuhayr
851576b444 Fixes #3907 2014-01-30 22:46:48 +10:30
Zuhayr
97442f4727 Adding Kilakk's fix for #4145 2014-01-30 22:31:22 +10:30
Zuhayr
65252e174b Fixes #4089 2014-01-30 22:18:01 +10:30
Zuhayr
a8cdbd939b Discovered/fixed a division by zero error for standing on the supermatter core. 2014-01-30 22:10:44 +10:30
Zuhayr
5039524f90 Fixes #4219 2014-01-30 22:07:20 +10:30
Zuhayr
b38e1a71be Fixes #4223 2014-01-30 22:06:57 +10:30
Zuhayr
bc48240fff Generalized yank_out_object(). 2014-01-30 21:56:33 +10:30
Zuhayr
651599a669 Fixes #4306 2014-01-30 21:35:02 +10:30
Zuhayr
7a36d1c9bc Fixes #4346 2014-01-30 21:30:58 +10:30
Zuhayr
eed21f3f5b Fixes #4355 2014-01-30 21:27:44 +10:30