cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-18 22:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,890 Commits 5 Branches 1 Tag
810de4ddaa57a2b51a302037382e34c8eb80362a
Commit Graph

6509 Commits

Author SHA1 Message Date
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
4e17dc0b93 Sanity checks. 2014-01-31 16:21:05 +03:00
Segrain
4c87838e64 Double call removal. 2014-01-31 16:19:22 +03:00
Segrain
9fdd34b1ba Removal of double reporting. 2014-01-31 00:28:25 +03: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
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
Zuhayr
f08e6c804d Rogue comma, kill it. 2014-01-30 23:33:57 +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
651599a669 Fixes #4306 2014-01-30 21:35:02 +10:30
Zuhayr
7a36d1c9bc Fixes #4346 2014-01-30 21:30:58 +10:30
Zuhayr
68258a3b1b Merge pull request #4348 from Ccomp5950/rp_revconvert_fix 
RP-revconvert bugfix
 2014-01-26 09:15:01 -08:00
Ccomp5950
50c077c09f Cryopod icon_state fix. 
Missing _ in the icon states.
 2014-01-26 01:39:07 -06:00
Ccomp5950
ddca656672 RP-revconvert bugfix 
Now only humans that are logged in, alive, and not already a revolutionary (no special_role) show up in the list.
Instead of EVERY mob type (simple_animals, borgs, etc.)
 2014-01-25 23:36:11 -06:00
Kilakk
44962760b8 Removed pointless output 
* There's something here about var/revsafe being used for heads/implanted people
... or something like that
 2014-01-24 15:04:41 -05:00
Kilakk
1a7616fb35 Fixes #4322 
* There's probably a much more "modular" way of doing this, but, eh
 2014-01-23 20:53:05 -05:00
Ccomp5950
c028db481e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2014-01-23 00:05:53 -06:00
Kani0824
7a7fc7e1ea Removed book that causes braindeadness 
Choosing a certain religion name and/or deity causes player to start out with 100 brain loss.  Removed that.
 2014-01-17 18:06:30 -05:00
Ccomp5950
775d75d2f4 Merge pull request #4301 from Loganbacca/bayfix-master 
Multiple typo and bug fixes
 2014-01-15 14:04:10 -08:00
Loganbacca
682dfd5670 More typo fixes 
Missed these in the last commit.
 2014-01-15 20:03:12 +13:00
Loganbacca
c83537a6a9 Sink filling typo 
No more filling the the bucket using the sink.
 2014-01-15 19:13:06 +13:00
Loganbacca
e145b61681 Refined earlier fix 
Tried a couple of other solutions, but this ended up being the most reliable.

Now checks all areas associated with the firedoor to see if they should still be down.

Also makes a final check before closing the door in case the fire alarm turns off in the middle of an autoclose cycle.
 2014-01-15 18:18:58 +13:00
Loganbacca
4953608bda Previous fix code cleanup 
Fixes #4295

Todo: investigate sub-areas not inheriting var/fire
 2014-01-14 18:47:29 +13:00
Loganbacca
c55e71c739 Fixes #4295 
Issue: firedoor not correctly entering alarmed state.

Todo: cleanup fix before PR
 2014-01-14 15:53:24 +13:00
Ccomp5950
d5bcef4f8a Uplink fix item spawner fix. 
Probably a merge conflict fix or something but some code got moved to an odd spot.
 2014-01-12 22:37:00 -06:00
Mloc
e826458900 Merge remote-tracking branch 'upstream/master' into dev-freeze 2014-01-12 21:55:11 +00:00
Mloc-Argent
0215410e02 Fix for assistants being unspawnable after one enters a cryopod. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-01-12 13:54:32 +00:00
Chinsky
1d6c645bc9 Merge pull request #4279 from Ccomp5950/pda_optimizations 
NanoUI PDA optimizations no more sortAtom every tick on every PDA.
 2014-01-11 18:48:55 -08:00
Ccomp5950
83ef93c41c Merge pull request #4270 from Baystation12/master 
Merge master into Dev
 2014-01-11 18:18:03 -08:00
Ccomp5950
167671d583 NanoUI PDA optimizations no more sortAtom every tick on every PDA. 
Should be noticably better on large population servers.
 2014-01-11 20:09:11 -06:00
Loganbacca
909928f3f9 Plasma glass stacking fix 2014-01-11 18:14:51 +13:00
Ccomp5950
3d34567d56 Merge pull request #4269 from LightningIron/master 
Bugfixes
 2014-01-10 19:28:23 -08:00
Zuhayr
adaccb3c3e Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-11 10:45:57 +10:30
DJSnapshot
4219b597b6 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/customitems/item_defines.dm
 2014-01-10 13:52:07 -08:00
Mloc
6f01e97161 Merge pull request #4248 from Zuhayr/dev 
Dionaea changes (microwave recipe, holder procs) and resist verb.
 2014-01-10 13:47:46 -08:00
Mloc
efa5a600e3 Merge pull request #4252 from RKF45/ears 
Tiny objects on ears
 2014-01-10 13:47:10 -08:00
DJSnapshot
e524d2112f Merge pull request #4244 from LightningIron/master 
Ninja bugfixes/minor code cleaning/energy cost changes
 2014-01-10 13:42:42 -08:00
DJSnapshot
f911f84bbd Replaces modwho and adminwho with staffwho. 
(Also, stealthfix.)
 2014-01-10 12:49:32 -08:00
Mloc-Argent
4c1e17649e Merge remote-tracking branch 'upstream/master' into dev 2014-01-10 20:07:47 +00:00
Chinsky
76dc0c4c49 Merge pull request #4234 from Mloc/bs12-quicklist 
[TG] Optimized and refactored list2text, text2list, and replacetext.
 2014-01-10 11:55:33 -08:00
Zuhayr
38f47f5ae1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-10 21:27:15 +10:30
Zuhayr
65e6a79946 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2014-01-10 21:26:47 +10:30
DJSnapshot
1e4abf785e Merge pull request #4237 from Mloc/bs12-tgstuff 
[TG] Lots of small (and maybe not so small) changes from tg.
 2014-01-09 22:33:28 -08:00
RKF45
16cc421e34 Tiny objects on ears 2014-01-09 23:45:08 +01:00
DJSnapshot
418a4b3631 Merge pull request #4247 from Zuhayr/master 
Cryostorage fixes.
 2014-01-09 14:39:08 -08:00
RKF45
c47be94b42 Removes braindeath as IC term 2014-01-09 21:49:21 +01:00
Mloc-Argent
dfe18845be Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-01-09 17:42:30 +00:00