cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-09 00:43:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,832 Commits 2 Branches 1 Tag
dbff9248495fc9ae4893f4bbdfb64c8bfa1c5f29
Commit Graph

1992 Commits

Author SHA1 Message Date
Mloc
dbff924849 fixes #6562 
fixes #6571

Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-01 17:48:17 +01:00
Mloc
6a91020529 fixes #6540 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-09-30 20:13:03 +01:00
Zuhayr
9272bc4542 Fixes #6351 and #6350. 2014-09-25 21:19:35 +09:30
Atlantiscze
19864ff3fe world << removal 
- Removes world << which was triggered by robotic reset modules.
 2014-09-21 04:09:01 +02:00
DJSnapshot
e6b5681db0 Rest of the fixes for custom borgs on module reset. 2014-09-14 06:22:46 -07:00
Zuhayr
1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts. 2014-09-13 16:54:48 +09:30
mwerezak
716c6ab3ef APC cell_type is now an actual power cell type 2014-09-10 22:12:43 -04:00
Whitellama
71c2317264 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into flame 
Conflicts:
	code/game/objects/items/weapons/storage/belt.dm
 2014-09-01 18:31:26 -07:00
Zuhayr
aedb3725f2 Fixes #5874 2014-09-01 23:20:27 +09:30
Zuhayr
066772b1ce Fixes #5879 2014-09-01 22:45:37 +09:30
Zuhayr
059532c155 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-09-01 22:03:29 +09:30
Whitellama
9cd42a3f33 Changes candle.dm procs to absolute paths 2014-08-31 19:48:34 -07:00
Whitellama
d536f7d56a Fixed police tape not going in tactical combat belts 2014-08-31 15:34:21 -07:00
Whitellama
f5c9586153 Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer. 2014-08-31 02:12:04 -07:00
Walter0o
c0b6f82ad0 emergency HTML/JS injection fix MK2, the underping. 
fixes a minor oversight in proc order after i shuffled them around.
 2014-08-27 15:42:59 +02:00
Walter0o
89d2c956ca emergency HTML/JS injection fix. 
sanitation of status display input was missing everywhere.
 2014-08-27 14:42:58 +02:00
Zuhayr
ee499426ad Compile fixes. 2014-08-21 12:19:10 +09:30
Zuhayr
b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
Ccomp5950
264aee843f Merge pull request #6063 from Whitellama/master 
Fixed eggs not going back into egg boxes
 2014-08-19 06:23:57 -05:00
Ccomp5950
25506f33fa Merge pull request #6032 from Walter0o/low_pressure_fix 
fixes #6005 and broken ancient human low/high pressure code.
 2014-08-19 05:54:30 -05:00
Whitellama
26721cf0d5 Fixed eggs not going back into egg boxes 2014-08-19 02:44:58 -07:00
Whitellama
7ced8104ca Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/objects/items/devices/transfer_valve.dm
 2014-08-17 17:50:07 -07:00
Zuhayr
2033923f8f Merge pull request #6018 from Hubblenaut/master 
Patch of fixes for bugs and oversights
 2014-08-18 09:28:17 +09:30
Whitellama
7539a6a5bb Added a JMP button to logs when someone adds something to a transfer valve. 2014-08-17 16:06:07 -07:00
Walter0o
e8592d4f41 fixes #6005 and broken ancient human low/high pressure code. 
-fixes low/high pressure not damaging unsealed/damaged spacesuits.
-refactors procs and adds more comments.
-removes unused/dead code.
 2014-08-17 18:06:30 +02:00
Hubblenaut
15ae5ca2a9 Adds JMP button to certain admin logs 2014-08-17 02:21:21 +02:00
Walter0o
f5ca79d003 fixes building more than 1 grille per turf 
rapidly triggering attack_self() enabled building more than 1 per turf,
which is fairly abusive and not indended.
 2014-08-16 22:48:13 +02:00
Chinsky
e4847b729e Merge pull request #5994 from GinjaNinja32/shards 
Stepping in shrapnel fix and unification of shard code
 2014-08-14 22:55:39 +04:00
Chinsky
07ed87ccd9 Merge pull request #5993 from GinjaNinja32/proximity2 
More proximity fixes
 2014-08-14 22:55:29 +04:00
GinjaNinja32
9b9b69f547 Use absolute paths 2014-08-14 11:20:07 +01:00
Zuhayr
43a7757252 Merge pull request #5982 from Jarcolr/customs 
Adds the cigar case as a premium cigarette vending machine item.
 2014-08-14 12:02:49 +09:30
Chinsky
af9f56f164 Merge pull request #5969 from GinjaNinja32/floortiles 
Adds floor painter.
 2014-08-14 06:31:09 +04:00
Hubblenaut
c80b921d6b Logs finishing tank transfer valve bombs and ghosting. Changes pAI request 
to state the name of the inquirer.
 2014-08-14 01:07:09 +02:00
GinjaNinja32
539392c14e Use \the macro 2014-08-13 21:30:28 +01:00
GinjaNinja32
05e7c4a07a Moved all shard code to one file. Fixed #5992 2014-08-13 21:05:27 +01:00
GinjaNinja32
d1fc12e1c7 More proximity fixes 2014-08-13 20:58:49 +01:00
Jarcolr
6c807199c9 Adds the cigar case as a premium vending item 
5 may be a bit too much, but who is going to get all those coins,
anyway?
 2014-08-13 12:10:43 +03:00
GinjaNinja32
b4e6b4e204 Fixes not checking proximity argument 2014-08-13 09:41:38 +01:00
GinjaNinja32
7b7f526903 Fixes being able to use the floor painter through windows, windoors etc. 2014-08-13 09:30:11 +01:00
GinjaNinja32
9abd6765b1 More floor tiles 2014-08-12 21:13:46 +01:00
GinjaNinja32
0493090f15 Add more floor tile types 2014-08-12 21:09:51 +01:00
GinjaNinja32
dcd5092f23 Add floor painter 2014-08-12 20:47:26 +01:00
Walter0o
7aa7f1c56c getting rid of text macro 2014-08-12 02:24:37 +02:00
Walter0o
dd39fbe985 typo fix 2014-08-11 23:23:38 +02:00
Zuhayr
f09d1218fe Master to dev merge. 2014-08-11 17:23:40 +09:30
Chinsky
18070da974 Merge pull request #5922 from Jarcolr/customs 
Complements the job specific satchels with 5 new job specific backpacks
 2014-08-10 04:02:26 +04:00
Jarcolr
b4e9d9923f Complements the satchels with backpacks 
5 new backpacks: virologist, chemistry, geneticist, science,
hydroponics.
 2014-08-08 22:20:11 +03:00
Chinsky
9f9865dac4 Merge pull request #5619 from mwerezak/power-net 
ATMOSPHERICS and Power Net Overhaul
 2014-08-08 09:49:42 +04:00
Zuhayr
aa90ebb0c6 Merge pull request #5903 from Ccomp5950/mouse-trap-tag-fix 
Fixed the font tag on mouse traps description.
 2014-08-07 10:01:23 +09:30
Ccomp5950
74fd47e2de Fixed the font tag on mouse traps description. 2014-08-05 18:55:15 -05:00