cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-28 11:02:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,956 Commits 2 Branches 1 Tag
0d94175887bee05e3decc39b1091e030b555210c
Commit Graph

6956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mloc
0d94175887 Merge pull request #1585 from comma/master 
Surgery fixes and tweaks
 2012-08-08 06:44:45 -07:00
comma
138e41dd54 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/objects/items/weapons/surgery_tools.dm

Did not do a pull in ages, all constants I sued in surgery code got renamed.
 2012-08-08 13:21:47 +04:00
Albert Iordache
980825aeec Updated the list of admins 2012-08-08 11:14:46 +03:00
Mloc
8e7bb98750 Merge pull request #1587 from caelaislinn/master 
misc
 2012-08-07 04:29:27 -07:00
Cael_Aislinn
e4600a8fa7 tweaks / fixes to carp a bit, removes munchkin from tgstation.dmm 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-07 21:23:55 +10:00
CIB
0021fe1f49 Nerfed changeling absorb objectives to 2-4 2012-08-06 15:24:50 -07:00
CIB
791e481d6e Removed a lagtastrous item 2012-08-06 14:12:04 -07:00
CIB
fafe55632b Merge pull request #1582 from FireFishie/hat2 
Captain's cap is now a hat
 2012-08-06 12:52:04 -07:00
comma
fe41c6ea1e Stops processing metroid's life after it's dead. 
Fixes issue #1463

Signed-off-by: comma <krauchinsky@gmail.com>
 2012-08-06 21:11:58 +04:00
comma
c9785bbeff Cannot weld strange rocks with unlit welder anymore. 
Fixes issue #1454
 2012-08-06 19:34:59 +04:00
comma
2e6da1ab7a Surgery changes. 
Gameplay-wise:
-Made all messages consistent, no more message about 'beginning' to do something when actually it's done. (Addresses Issue #1540)
-Now to attack patient on table with surgery tool you need to have harm intent (Addresses Issue #1540)
-All surgeries now have delays and begin/finish messages on each step, much like bone surgery.

Code-wise:
-All code handling surgery steps was moved in appropriate procs for each tool, to get rid of one HUGE attack proc.
Now attack proc checks for prereqs for surgery (like masks covering face), checks for targeted zone and calls needed proc.
-Deleted all code that handled messages for when user performs surgery on himself, because that's honest to god dead code. You need to be down to get surgery don on you, and you can't use tools while down. So until something is changed, those messages removed to improve readability of code.
-Added interrupt proc, that handles interruptions during surgery for each tool. For now all types of surgery handled the same, may be implemented differently later.

Signed-off-by: comma <krauchinsky@gmail.com>
 2012-08-06 19:07:48 +04:00
Mloc
2270fdf051 Merge pull request #1584 from caelaislinn/master 
various bugfixes, mapfixes and minor improvements
 2012-08-06 07:34:55 -07:00
Cael_Aislinn
f52eb099f7 tweaks, fixes and additions to carp and simple_animals 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-07 00:03:56 +10:00
Cael_Aislinn
40c07aacd9 added freezer to toxins and fixed layout of mass driver, by cubejackal. also replaced bombs in syndicate shuttle with heavy c4 (this will probably come back to bite me) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-07 00:03:36 +10:00
FireFishie
9b4cdb357e Captain's cap is now a hat 
-Traded the Captain's cap back for the hat, as the cap is actually not all that sensible
 2012-08-06 06:50:31 -04:00
Cael_Aislinn
bc58cbe6a3 fix for announcement bug 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-06 17:21:46 +10:00
Cael_Aislinn
6ffa554021 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-08-06 16:04:41 +10:00
Mloc
5608872176 that was short. 2012-08-05 23:58:07 +02:00
Cael_Aislinn
3e6f253cb7 various tweaks to energy fields, energy field artifacts (some outstanding bugs still) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-06 05:13:02 +10:00
Cael_Aislinn
b9f9f21e8b granted bountylord13 soghun access 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-06 04:52:57 +10:00
Mloc
3bc5e3b165 Merge pull request #1576 from caelaislinn/master 
mice + vents etc
 2012-08-05 11:10:16 -07:00
Mloc
d398b4e05d Fixed a derp with the whitelist and server updating. 2012-08-05 19:11:58 +02:00
Cael_Aislinn
136b8e44e3 oops 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-06 00:17:05 +10:00
Mloc
a2b41715dc Update config/admins.txt 2012-08-05 15:22:36 +02:00
Cael_Aislinn
d7bd58b8f3 roach remains have a bit more substance now 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-05 21:47:03 +10:00
Cael_Aislinn
8ea015dca9 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-08-05 21:04:58 +10:00
Cael_Aislinn
52fdda910a mice can crawl through vents and hide under objects 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-05 21:03:16 +10:00
Mloc
e96ddb5607 Merge pull request #1575 from caelaislinn/master 
fix for mouseception
 2012-08-05 03:43:52 -07:00
Cael_Aislinn
bece31d819 fix for mouseception naming bug 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-05 20:00:43 +10:00
Albert Iordache
27920a6c59 Merge branch 'mechrevert' of https://github.com/Nerezza/Baystation12 into Nerezza-mechrevert 
Conflicts:
	code/game/mecha/mecha.dm
 2012-08-04 22:48:25 +03:00
Albert Iordache
521e94aa62 Merge pull request #1572 from caelaislinn/master 
various misc
 2012-08-04 12:38:24 -07:00
Cael_Aislinn
eaa28099d3 compile fixes, more tweaks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-05 03:52:17 +10:00
Cael_Aislinn
2b2017126a tweaks to simple_animals, carps no longer freeze / require oxy to live (but rapidly burn up from 25+ degree temp), kobolds no longer require oxy to live 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-05 03:13:49 +10:00
Cael_Aislinn
321e8e9e21 uncommented some missing supply datums 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-05 02:21:45 +10:00
Albert Iordache
0fd0f5dbf0 Merge pull request #1571 from caelaislinn/master 
compile fixes
 2012-08-04 04:03:01 -07:00
Albert Iordache
e685276c91 Merge pull request #1569 from FireFishie/map3 
Minor map changes and a changelog
 2012-08-04 04:00:04 -07:00
Cael_Aislinn
6d0058a31e fix for contraband >.>, also simple_animals can't buckle themselves in now 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 20:58:53 +10:00
Cael_Aislinn
8d4f6a8efe admins can change the serial number of a rolled up poster to change the poster decal type when applied. note that you'll need to change the name of the rolled up poster to reflect this if you want to avoid confusion 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 20:00:59 +10:00
CIB
429b04149a Merge pull request #1570 from caelaislinn/master 
various simple_animal tweaks, fixes and improvements
 2012-08-04 02:48:55 -07:00
CIB
e0c67241cf Added cyborg to jobbans for security etc. 2012-08-04 12:41:50 +03:00
Cael_Aislinn
93f864083c doubled zas debug sensitivity, some tweaks to mouse/ghost spawning 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 19:23:40 +10:00
Cael_Aislinn
2cb704f617 tweaks and fixes to a couple of supply crates 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 16:23:23 +10:00
Cael_Aislinn
714a9b120f compile fix 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 15:56:18 +10:00
Cael_Aislinn
46a450069e - simple_animals can't open doors by default 
- alien larvae, mice can hide under mobs
- roaches, mice can hide under various objects
- various tweaks, including flavour and existing mechanics
- fix for ghosts not being able to spawn as mice
- added move delay of half a second to simple_animals (about the same as human walkspeed?)
- simple_animals, when talking, can only understand each other (and mobs with universal_speak)

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 15:47:56 +10:00
Cael_Aislinn
0b14f97af0 hardcap for vermin spawning (30, editable via gameticker) 2012-08-04 15:44:02 +10:00
FireFishie
19dfb0b1bf Changelog update to explain my commits 2012-08-03 23:28:35 -04:00
Cael_Aislinn
c4ba455f35 added var to /mob to allow some mobs to share spaces 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 13:12:17 +10:00
FireFishie
2beb6110ae SS13 no more 
-Removed the SPACE STATION 13 sign from the central primary hallway, because we're on board the Exodus
 2012-08-03 22:45:45 -04:00
FireFishie
01765aa13d Changed name of Warden to Warden's Office 
-This resolves issue 1490
 2012-08-03 21:55:22 -04:00
FireFishie
de739622bb Changed Important Memo and a chair 
-Important Memo is now Central Advisory and warns the captain about the dangers of space
-CMO now has an office chair so he can easily turn around and use the computers behind him
 2012-08-03 21:52:40 -04:00